41 files changed, 158471 insertions, 137361 deletions

diff --git a/NEWS b/NEWS
index aa62d77a65..139f2f8990 100644
--- a/NEWS
+++ b/NEWS
@@ -1,206 +1,272 @@
-Evoluiton 1.3.2, 2003-04-07
+Evoluiton 1.3.2, 2003-04-09
 ---------------------------
 
 Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
 
   * Addressbook
 
-    #40901 - HIG-ify the LDAP server editor dialog's button
-             layout. (Toshok)
-    #40841 - Ctrl-v was being used for both "Save As VCard" and
-             "Paste" (Toshok)
-    #40727 - email autocompletion not listing all names (Toshok)
-    #40715 - Merge email address dialog non functional when adding
-             contact that already exists. (Toshok)
-    #40403 - can't edit contact lists (Toshok)
-    #40046 - To: and Cc: fields not accepting accented letters
+    #7103  - Addressbook doesn't play nice with dark themes.  (Toshok)
+    #19178 - importers only target default contact folder.  (Toshok)
+    #20210 - Cannot save changes when invoked from mailer.  (Toshok)
+    #23036 - Export Contact Data to CSV, XLS, etc.  (for mail merge,
+             etc.) (Gilbert Fang)
+    #25148 - Selected contacts fields are not scrolling properly.
              (Toshok)
-    #40026 - Using pulldown to view multiple emails changes email to
-             random characters (Toshok)
-    #39788 - Can't add email address to contact (Toshok)
-    #39763 - Pasting text into "To:" field doesn't work (Toshok)
-    #39730 - Search Base Callback Not Working (Toshok).
-    #39692 - file type names should not be OAF component names
-             (Ettore)
-    #39507 - Select-names search broken. (Toshok)
-    #39381 - crash when adding an address from an email to addressbook.
+    #31786 - LDAP config dialog not properly internationalized.
              (Toshok)
-    #39256 - "Forward Contact", "Send Message to Contact" don't
-             work. (NotZed)
-    #39170 - void function should not has a 'return' keyword (Philip
-             Zhao)
-    #38202 - Evolution crashed when I clicked the send button (NotZed)
-    #37204 - Ximian, Inc. contact info update (NotZed)
+    #32113 - Problem with UTF8 and contact list.  (Toshok)
+    #34085 - drag+drop not finalizing.  (Toshok)
     #34651 - Searches with 8bit ascii char. not working in Select
-             Contacts (Toshok)
-    #34085 - drag+drop not finalizing (Toshok)
-    #32113 - Problem with UTF8 and contact list (Toshok)
-    #31786 - LDAP config dialog not properly internationalized
+             Contacts.  (Toshok)
+    #37204 - Ximian, Inc. contact info update.  (Michael)
+    #38202 - Evolution crashed when I clicked the send button.  (Michael)
+    #39170 - void function should not has a 'return' keyword.  (Philip
+             Zhao)
+    #39256 - "Forward Contact", "Send Message to Contact" don't
+             work.  (Michael)
+    #39381 - crash when adding an address from an email to addressbook.
              (Toshok)
-    #25148 - Selected contacts fields are not scrolling properly
+    #39507 - Select-names search broken.  (Toshok)
+    #39730 - Search Base Callback Not Working.  (Toshok).
+    #39763 - Pasting text into "To:" field doesn't work.  (Toshok)
+    #39788 - Can't add email address to contact.  (Toshok)
+    #40026 - Using pulldown to view multiple emails changes email to
+             random characters.  (Toshok)
+    #40046 - To: and Cc: fields not accepting accented letters.
              (Toshok)
-    #23036 - Export Contact Data to CSV, XLS, etc. (for mail merge,
-             etc.) (Gilbert Fang)
-    #20210 - Cannot save changes when invoked from mailer (Toshok)
-    #19178 - importers only target default contact folder. (Toshok)
-    #7103  - Addressbook doesn't play nice with dark themes (Toshok)
+    #40403 - can't edit contact lists.  (Toshok)
+    #40715 - Merge email address dialog non functional when adding
+             contact that already exists. .  (Toshok)
+    #40727 - email autocompletion not listing all names.  (Toshok)
+    #40841 - Ctrl-v was being used for both "Save As VCard" and
+             "Paste".  (Toshok)
+    #40901 - HIG-ify the LDAP server editor dialog's button
+             layout.   (Toshok)
+
+  * Calendar
+
+    #17231 - Private settings not retained.  (JP)
+    #31382 - Free/busy retrieval didn't work for http source.  (Rodrigo)
+    #31660 - Appointments with "for" recurrence synced with no end date.
+             (JP)
+    #32248 - Todo items imported from pilot have time set to 00:00.  (JP)
+    #34095 - Memory leaks.  (Hans Petter)
+    #34505 - Duplicate alarm dialogs for appts in exchange calendar.
+             (Rodrigo)
+    #35926 - Contacts entry in appointment editor to be removed.
+             (Hans Petter)
+    #37935 - Drawing problems in mini-calendar.  (Hans Petter)
+    #39262 - Crash when importing an ics file to local calendar.  (Rodrigo)
+    #39356 - New evo users didn't get calendar.  (Rodrigo)
+    #39692 - File type names should not be OAF component types.  (Ettore)
+    #39735 - View settings not persistent between sessions.  (Jeff)
+    #39736 - Times in day view too large.  (Hans Petter)
+    #39740 - Crash clicking in Attendees field when creating new
+             meeting.  (Rodrigo)
+    #39757 - Couldn't delete reminder for appointment.  (Hans Petter)
+    #39770 - Not meeting request sent.  (Rodrigo)
+    #39803 - Bottom part of text cut off in month view.  (Hans Petter)
+    #39895 - Selection vanishes when day view loses focus.  (Michael/Hans)
+    #39954 - Crash when setting recurrence rule for an appointment.
+             (Hans Petter)
+    #39955 - Crash when forwarding an appointment as icalendar.  (JP)
+    #39961 - Appointment schedule autopick menu displays under File.
+             (Rodrigo)
+    #40133 - wombat startup error. (Toshok)
+    #40258 - Recurring event displayed truncated description.  (Hans Petter)
+    #40578 - Event summaries cut off in month view.  (Hans Petter)
+    #40655 - Mini-calendar always showed January 1970.  (Hans Petter)
+    #40661 - Missing header for Forte compilation.  (Rodrigo)
+    #40722 - Crash when closing a meeting.  (JP)
+    #40789 - Didn't remember reminder text.  (JP)
+    #40790 - Didn't launch programs added as reminders.  (JP)
+    #40792 - Buttons in Select File dialog for sound reminder didn't
+             work.  (Ettore)
 
   * Mail
 
-    #40535 - Send/receive dialogue should transient for parent
+    #29564 - Message list loses focus when you expunge.  (Michael)
+    #33786 - Crash when invalid expression fed to vFolder.  (Michael)
+    #36245 - Translation string context problem.  (Dan)
+    #37084 - Mailer forgets message list pane size on startup.
              (Michael)
-    #40608 - Crash saving attachment (Jeff)
-    #40300 - Files are only detected for recovery when you start an
-             editor (Michael)
-    #40522 - Two passphrase dialogues viewing encrypted mail (Michael)
-    #40074 - Threads always open expanded (Jeff)
-    #40472 - Crash after entering password (Michael)
-    #37084 - Mailer forgets message list pane size on startup
+    #38227 - Button spacing issues.  (Ettore)
+    #38461 - Mail importers cannot import to non-local folders.
              (Michael)
-    #39870 - Message browser button sensitivity not correct (Jeff)
-    #40314 - Some folders not expandable in subscriptions dialog
-             (Jeff)
-    #40188 - Context menu on addresses crashes (Michael)
-    #40083 - Search box doesn't work on subscription dialog - it was
-             removed (Jeff)
-    #40124 - Cannot unsubscribe from folders that aren't selectable
-             (Jeff)
-    #39204 - Charset handling problems with broken mails (Jeff)
-    #40043 - A warning dialog wont go away (Jeff)
-    #38461 - Mail importers cannot import to non-local folders
-             (Michael)
-    #39741, 39914, 38926 - Configuration dialogs overlap each other
-             (Ettore, Jeff)
-    #39464 - Trying to remove a duplicate vfolder crashes (Michael)
-    #39759 - Crash using search dialog (Michael)
-    #29564 - Message list loses focus when you expunge (Michael)
-    #39809 - Dialog's don't match gnome 2 layout (Jeff)
-    #39382 - Signature editor dialog buttons messed up (Jeff)
-    #39325 - Allow user to enable/disable account from account list
-             (Jeff)
+    #38659 - RFC2047 word encoding errors.  (Jeff)
+    #38926 - Configuration dialogs overlap each other. (Ettore, Jeff)
     #39165 - Losing all vFolder rules after editing them, until
-             restart (Michael)
-    #39256 - Send message to contact/forward contact doesn't work
+             restart.  (Michael)
+    #39168 - compiler compatability, empty structs.  (Jeff)
+    #39170 - Compiler compatibility, returning a void return value.
+             (Jeff)
+    #39173 - prototype mismatch.  (Jeff)
+    #39204 - Charset handling problems with broken mails.  (Jeff)
+    #39256 - Send message to contact/forward contact doesn't work.
              (Michael)
-    #38227 - Button spacing issues (Ettore)
-    #36245 - Translation string context problem (Dan)
-    #39654 - vFolder source remove button doesn't work (Jeff)
-    #39170 - compiler compatability, returning a void return value
+    #39325 - Allow user to enable/disable account from account list.
              (Jeff)
-    #38659 - rfc2047 word encoding errors (Jeff)
-    #40103 - Deadlock at startup (Michael)
+    #39382 - Signature editor dialog buttons messed up.  (Jeff)
+    #39464 - Trying to remove a duplicate vfolder crashes.  (Michael)
+    #39486 - Cancelling send/receive could cause a crash.  (Michael)
+    #39654 - vFolder source remove button doesn't work.  (Jeff)
+    #39696 - Default composer window title is meaningless. (Jeff)
+    #39741 - Configuration dialogs overlap each other. (Ettore, Jeff)
     #39744 - Sending 8 bit mime to a smtp server which doesn't say it
-             supports it (Jeff)
-    #39486 - Cancelling send/receive could cause a crash (Michael)
-    #33786 - Crash when invalid expression fed to vFolder (Michael)
-    #39173 - prototype mismatch (Jeff)
-    #39168 - compiler compatability, empty structs (Jeff)
-    #40764 - composer backs up drafts too often (Jeff)
-    #40679 - composer crash browsing files to attach (Jeff)
-    #39813 - Crash/noop adding signature script (Jeff)
-    #39800 - Make To: have focus on a new message (Jeff)
+             supports it. (Jeff)
+    #39759 - Crash using search dialog.  (Michael)
+    #39800 - Make To: have focus on a new message.  (Jeff)
+    #39809 - Dialog's don't match gnome 2 layout.  (Jeff)
+    #39813 - Crash/noop adding signature script.  (Jeff)
+    #39870 - Message browser button sensitivity not correct.  (Jeff)
+    #39914 - Configuration dialogs overlap each other. (Ettore, Jeff)
     #39924, and many others - Subject entry box didn't work
-             properly/support i18n very well (Jeff)
-    #39696 - Default composer window title is meaningless (Jeff)
+             properly/support i18n very well.  (Jeff)
+    #40043 - A warning dialog wont go away.  (Jeff)
+    #40074 - Threads always open expanded.  (Jeff)
+    #40083 - Search box doesn't work on subscription dialog - it was
+             removed.  (Jeff)
+    #40103 - Deadlock at startup.  (Michael)
+    #40124 - Cannot unsubscribe from folders that aren't selectable.
+             (Jeff)
+    #40188 - Context menu on addresses crashes.  (Michael)
+    #40300 - Files are only detected for recovery when you start an
+             editor.  (Michael)
+    #40314 - Some folders not expandable in subscriptions dialog.
+             (Jeff)
+    #40472 - Crash after entering password.  (Michael)
+    #40522 - Two passphrase dialogues viewing encrypted mail.  (Michael)
+    #40536 - Send/receive dialogue should transient for parent.
+             (Michael)
+    #40608 - Crash saving attachment.  (Jeff)
+    #40679 - composer crash browsing files to attach.  (Jeff)
+    #40764 - composer backs up drafts too often.  (Jeff)
 
-  * Calendar
+  * Shell
 
-    #40133 - wombat startup error (Toshok)
-    #31382 - Free/busy retrieval didn't work for http source (Rodrigo)
-    #39356 - New evo users didn't get calendar (Rodrigo)
-    #39740 - Crash clicking in Attendees field when creating new
-             meeting (Rodrigo)
-    #39736 - Times in day view too large (Hans Petter)
-    #39757 - Couldn't delete reminder for appointment (Hans Petter)
-    #34095 - Memory leaks (Hans Petter)
-    #34505 - Duplicate alarm dialogs for appts in exchange calendar
-             (Rodrigo)
-    #39692 - File type names should not be OAF component types (Ettore)
-    #39770 - Not meeting request sent (Rodrigo)
-    #31660 - Appointments with "for" recurrence synced with no end date
-             (JP)
-    #32248 - Todo items imported from pilot have time set to 00:00 (JP)
-    #39954 - Crash when setting recurrence rule for an appointment
-             (Hans Petter)
-    #39895 - Selection vanishes when day view loses focus
-             (NotZed/Hans Petter)
-    #39961 - Appointment schedule autopick menu displays under File
-             (Rodrigo)
-    #17231 - Private settings not retained (JP)
-    #40661 - Missing header for Forte compilation (Rodrigo)
-    #39955 - Crash when forwarding an appointment as icalendar (JP)
-    #39262 - Crash when importing an ics file to local calendar (Rodrigo)
-    #40722 - Crash when closing a meeting (JP)
-    #40789 - Didn't remember reminder text (JP)
-    #40792 - Buttons in Select File dialog for sound reminder didn't
-             work (Ettore)
-    #40790 - Didn't launch programs added as reminders (JP)
-    #37935 - Drawing problems in mini-calendar (Hans Petter)
-    #40578 - Event summaries cut off in month view (Hans Petter)
-    #40258 - Recurring event displayed truncated description (Hans Petter)
-    #39803 - Bottom part of text cut off in month view (Hans Petter)
-    #40655 - Mini-calendar always showed January 1970 (Hans Petter)
-    #39735 - View settings not persistent between sessions (Jeff)
-    #35926 - Contacts entry in appointment editor to be removed
-             (Hans Petter)
+    #17034 - Use UTF-8 in about box.  (Michael)
+    #34371 - Tries to open other user's folder with blank user field.
+    	     (Ettore)
+    #38775 - Version number hardcoded in warning dialog text.  (Michael)
+    #38974 - Xlib dependency causing linking error on Solaris.  (Ettore)
+    #39096 - Start-up crash on Solaris.  (Ettore) 
+    #39467 - Crash when splash image not found.  (Michael)
+    #39599 - Crash when folder icons missing.  (Ettore)
+    #39692 - OAFIIDs being shown in the importer dialog.  (Ettore)
+    #39706 - Settings window too big.  (Michael)
+    #40377 - Old stale wombat servers not being killed.  (Ettore)
+    #40413 - Problem with closing the folder selector dialog.  (Ettore)
+    #40474 - Summary settings not imported from 1.2.  (Michael)
+    #40590 - Signature settings upgrade problem.  (Michael)    
+    #40652 - Folder bar not resizing after resizing Evolution window.
+            (Michael)
+    #40748 - Cannot resize icons in the shortcut bar.  (Ettore)
+    #40854 - Problem with selecting other user's folder.  (Dan)
+    #40888 - Crash when selecting other user's folder.  (Dan)
+
+  * Summary
+
+     #5344  - Missing weather locations.  (Marten Woxberg)
+     #7153  - Stock folder names not translated.  (Ettore)
+     #12066 - Missing weather locations.  (Dan)
+     #15740 - Missing weather locations.  (Dan)
+     #18015 - Missing weather locations.  (Dan)
+     #19957 - AM/PM setting not being honoured.  (Ettore)
+     #40358 - Summary page not showing properly in non-C locales.
+              (Ettore)
+     #40141 - Preferences settings inconsistency when clicking "Close".
+              (Michael)
+     #32027 - Missing locations.  (Dan)
 
 Other bugs:
 
   * Addressbook
 
-    - HIG'ify the e-address-popup's buttons layout. (Toshok)
-    - Add input method support to the minicard view. (Toshok)
-    - Make the minicard view listen for style changes. (Toshok)
+    - HIG'ify the e-address-popup's buttons layout.  (Toshok)
+    - Add input method support to the minicard view.  (Toshok)
+    - Make the minicard view listen for style changes.  (Toshok)
     - Fix the select names component to be more friendly to non-shlib
-      components. (Dan)
+      components.  (Dan)
     - Fix various errors in the contact editor caused by parsing
       addresses when we don't need to - especially after the user has
       explicitly entered the elements of the address
-      themselves. (Toshok)
+      themselves.  (Toshok)
     - Replace GtkImage based arrow buttons in the contact editor with
-      GtkArrow. (Toshok)
+      GtkArrow.  (Toshok)
+
+  * Calendar
+
+    - Replaced all references to GdkFont deprecatedness with Pango.
+      (Hans Petter)
+    - Alarm notification fixes.  (Rodrigo)
+    - Timezone dialog fix.  (Dan)
+    - Use weak refs instead of destroy signal.  (Rodrigo, Hans Petter)
+    - Use GtkMessageDialogs for meeting-related questions.  (Rodrigo)
+    - GtkObject -> GObject fixes.  (Everyone)
+    - Connector-related fixes.  (Dan)
+    - Made meeting/scheduling work correctly.  (JP)
 
   * Mail
 
-    - Clear passwords didn't work (Michael)
+    - Clear passwords didn't work.  (Michael)
     - Show preview and view threaded were made per-folder, as in
-      1.2.x, 1.3.1 had them global (Michael)
+      1.2.x, 1.3.1 had them global.  (Michael)
     - Make the printing dialog, and account editor transient for the
-      parent (Larry, Jeff)
-    - Check for unique filter/vFolder names in all cases (Michael)
-    - Most warnings removed (Jeff, Michael)
+      parent.  (Larry, Jeff)
+    - Check for unique filter/vFolder names in all cases.  (Michael)
+    - Most warnings removed.  (Jeff, Michael)
     - some text/plain mails detected as text/html, re-do the fix for
-      #16817 to make it pickier (Michael)
-    - Imap buffer overflow potential (Timo Sirainen)
-    - GSSAPI SASL support (Jeff)
+      #16817 to make it pickier.  (Michael)
+    - Imap buffer overflow potential.  (Timo Sirainen)
+    - GSSAPI SASL support.  (Jeff)
     - Handle broken header charset checking similarly to badly
-      labelled/broken body content (Dan)
+      labelled/broken body content.  (Dan)
     - Various glib deprecation issues, and use non-locale specific
-      string compares in various places (Jeff, Michael)
+      string compares in various places.  (Jeff, Michael)
     - Mail piped to the sendmail transport is canoncalised into Un*x
       format, using network format (CRLF) confuses some versions of
-      postfix (Jeff).
-    - Some work on fixing cut and paste shortcuts in composer (Jeff)
+      postfix.  (Jeff)
+    - Some work on fixing cut and paste shortcuts in composer.  (Jeff)
     - Made the EvolutionComposer corba interfaces work again/port to
-      gnome 2 (Michael)
+      GNOME 2.  (Michael)
 
-  * Calendar
+  * Shell
 
-    - Replaced all references to GdkFont deprecatedness with Pango
-      (Hans Petter)
-    - Alarm notification fixes (Rodrigo)
-    - Timezone dialog fix (Dan)
-    - Use weak refs instead of destroy signal (Rodrigo, Hans Petter)
-    - Use GtkMessageDialogs for meeting-related questions (Rodrigo)
-    - GtkObject -> GObject fixes (Everyone)
-    - Connector-related fixes (Dan)
-    - Made meeting/scheduling work correctly (JP)
+    - Fixed some problems with the folder dialogs.  (Dan)
+    - Fixed shell .server files.  (Dan)
+    - Added --force-shutdown to the shell as a killev replacement.
+      (Dan)
+    - Make Evolution use large WM icons.  (Ettore)
+    - Made the offline dialog work again.  (Ettore)
+    - Fixed importer framework to support non-local folders.  (Ettore)
+
+  * Summary
+
+    - Make creation of the summary settings page faster.  (Dan)
 
   * All
 
     - A number of compiler portability fixes, varadic macro's,
       __FUNCTION__ -> G_GNUC_FUNCTION, inline usage, void returns, etc
       (Everyone)
+    - Fixed druid colors.  (Dan)
+
+Updated translations:
+
+  - cs (Miloslav Trmac)
+  - de (Christian Neumair)
+  - es (Francisco Javier Fernandez)
+  - fi (Sami Pesonen)
+  - hu (Andras Timar)
+  - it (Marco Ciampa)
+  - no (Kjartan Maraas)
+  - pt (Duarte Loreto)
+  - pt_BR (Gustavo Maciel Dias Vieira)
+  - sk (Stanislav Visnovsky)
+  - sv (Christian Rose)
+  - uk (Yuriy Syrota)
+  - zh_TW (Chao-Hsiung Liao)
+
 
 Evolution 1.3.1, 2003-03-05
 ---------------------------
diff --git a/configure.in b/configure.in
index af55d832fb..400d6f0313 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
-AC_INIT(evolution, 1.3.1.99, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 1.3.2, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
diff --git a/po/am.po b/po/am.po
index ff89187e8b..cf54ce15a3 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2003-02-07 18:40+0100\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-02-07 17:46+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -15,30 +15,35 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.h:1
-msgid "Factory to import LDIF files into Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.h:2
-msgid "Imports LDIF files into Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.h:1
-msgid "Factory to import VCard files into Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.h:2
-msgid "Imports VCard files into Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/backend/ebook/e-card.c:1297
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/backend/ebook/e-card.c:1311
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
@@ -46,13 +51,13 @@ msgid "Name"
 msgstr "ስም"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/backend/ebook/e-card.c:1338
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "ኢሜይል"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr ""
 
@@ -62,8 +67,8 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1400
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
@@ -71,8 +76,8 @@ msgstr ""
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr ""
 
@@ -82,12 +87,12 @@ msgid "Bus"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr ""
 
@@ -98,13 +103,13 @@ msgstr ""
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "መጀመሪያ"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1358
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr ""
@@ -115,18 +120,18 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "ሞቢል"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr ""
@@ -136,13 +141,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "የቤት ፋክስ"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr ""
 
@@ -151,43 +156,43 @@ msgid "Bus 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "መጀመሪያ"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/contact-editor/e-contact-editor.c:1812
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "ሌላ"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "ሬዲዮ"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr ""
@@ -198,15 +203,15 @@ msgid "TTY"
 msgstr "tty"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:482
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "ኢሜይል"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:492
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "ኢሜይል"
@@ -230,7 +235,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1372
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "ቢሮ"
@@ -240,7 +245,7 @@ msgid "Off"
 msgstr "አጥፋ"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1379
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "አርእስት"
@@ -255,7 +260,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1393
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "መቆጣጠሪያ"
@@ -269,7 +274,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1407
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "ቅጽል ስም"
@@ -279,19 +284,19 @@ msgid "Nick"
 msgstr "ቅጽል"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1414
+#: addressbook/backend/ebook/e-card.c:1418
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1448
+#: addressbook/backend/ebook/e-card.c:1459
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "ማስታወሻ"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1434
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "የቀን መቁጠሪያ URI"
 
@@ -309,260 +314,261 @@ msgid "FBUrl"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:100
-#: addressbook/backend/ebook/e-card.c:1421
-msgid "Anniversary"
+msgid "Default server calendar"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:100
-msgid "Anniv"
+#, fuzzy
+msgid "icsCalendar"
+msgstr "ቀን መቁጠሪያ"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
+msgid "Anniversary"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Anniv"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:104
-#: addressbook/backend/ebook/e-card.c:1462
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "ምድቦች"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "የቤተሰብ ስም"
 
-#: addressbook/backend/ebook/e-card-simple.c:334
+#: addressbook/backend/ebook/e-card-simple.c:335
 msgid "ECard"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:829
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:890
+#: addressbook/backend/ebook/e-card-simple.c:893
 #: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1304
+#: addressbook/backend/ebook/e-card.c:1308
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:319
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "ሙሉ ስም"
 
-#: addressbook/backend/ebook/e-card.c:1317
+#: addressbook/backend/ebook/e-card.c:1321
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 msgid "Address"
 msgstr "አድራሻ"
 
-#: addressbook/backend/ebook/e-card.c:1324
+#: addressbook/backend/ebook/e-card.c:1328
 msgid "Address Label"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1331
+#: addressbook/backend/ebook/e-card.c:1335
 msgid "Phone"
 msgstr "ስልክ"
 
-#: addressbook/backend/ebook/e-card.c:1345
+#: addressbook/backend/ebook/e-card.c:1349
 msgid "Birth date"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1351
+#: addressbook/backend/ebook/e-card.c:1355
 #: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
-#: addressbook/backend/ebook/e-card.c:1365
+#: addressbook/backend/ebook/e-card.c:1369
 msgid "Organizational Unit"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1386
+#: addressbook/backend/ebook/e-card.c:1390
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1427 mail/mail-format.c:933
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
 msgid "Mailer"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1441
+#: addressbook/backend/ebook/e-card.c:1445
 msgid "Free/Busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1455
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "ቀን መቁጠሪያ"
+
+#: addressbook/backend/ebook/e-card.c:1466
 msgid "Related Contacts"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1469
+#: addressbook/backend/ebook/e-card.c:1480
 msgid "Category List"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1476
+#: addressbook/backend/ebook/e-card.c:1487
 msgid "Wants HTML"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1483
+#: addressbook/backend/ebook/e-card.c:1494
 msgid "Wants HTML set"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1490
+#: addressbook/backend/ebook/e-card.c:1501
 msgid "List"
 msgstr "ዝርዝር"
 
-#: addressbook/backend/ebook/e-card.c:1497
+#: addressbook/backend/ebook/e-card.c:1508
 msgid "List Show Addresses"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1504
+#: addressbook/backend/ebook/e-card.c:1515
 msgid "Arbitrary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1511
+#: addressbook/backend/ebook/e-card.c:1522
 msgid "ID"
 msgstr "ID"
 
-#: addressbook/backend/ebook/e-card.c:1518
+#: addressbook/backend/ebook/e-card.c:1529
 msgid "Last Use"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1529
+#: addressbook/backend/ebook/e-card.c:1540
 msgid "Use Score"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2870
-msgid "Multiple VCards"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:2878
-#, c-format
-msgid "VCard for %s"
-msgstr ""
-
 #: addressbook/backend/ebook/test-client-list.c:15
 #: addressbook/backend/ebook/test-client.c:33
 #: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "bonobo ማስጀመር አልቻልኩም!"
 
-#: addressbook/backend/pas/pas-backend-file.c:355
-#: addressbook/backend/pas/pas-backend-ldap.c:3038
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:357
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "በመጫን ላይ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:597
+#: addressbook/backend/pas/pas-backend-ldap.c:598
 msgid "Using Distinguished Name (DN)"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:601
+#: addressbook/backend/pas/pas-backend-ldap.c:602
 msgid "Using Email Address"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:747
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1290
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1396
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1632
-#: addressbook/backend/pas/pas-backend-ldap.c:1635
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2949
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:3058
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:292
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:535
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:548
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1267
-#: calendar/conduits/todo/todo-conduit.c:877
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1268
-#: calendar/conduits/todo/todo-conduit.c:878
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
+msgid "Configure access to LDAP directory servers here"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
+msgid "Directory Servers"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+msgid "Evolution Addressbook"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
+msgid "Evolution Addressbook LDAP Configuration Control"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
+msgid "Evolution Addressbook address pop-up"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
+msgid "Evolution Addressbook address viewer"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
+msgid "Evolution Addressbook card viewer"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
+msgid "Evolution Addressbook component"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Factory for the controls exported by the Evolution Addressbook"
+msgid "Evolution Addressbook folder viewer"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:612
+#: addressbook/gui/component/addressbook-component.c:605
 #: calendar/gui/dialogs/comp-editor-util.c:309
 #: calendar/gui/dialogs/comp-editor-util.c:365
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1086
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
 msgstr ""
 
@@ -586,27 +592,27 @@ msgstr ""
 msgid "Public folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:576
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr ""
 
@@ -626,27 +632,27 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1191
+#: addressbook/gui/component/addressbook-config.c:1193
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1213
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1221
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1647
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1649
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "የሰርቨር ስም"
 
-#: addressbook/gui/component/addressbook-config.c:1686
+#: addressbook/gui/component/addressbook-config.c:1676
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
@@ -654,20 +660,20 @@ msgstr ""
 msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:513
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:523
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:528
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -675,56 +681,55 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:537
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
 "is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:558
+#: addressbook/gui/component/addressbook.c:557
 msgid "Unable to open addressbook"
 msgstr ""
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:618
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:661
+#: addressbook/gui/component/addressbook.c:667
 msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:669
-#: addressbook/gui/component/addressbook.c:672
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:807
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:808
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:809
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:810
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:811
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "ጠለቅ"
 
-#: addressbook/gui/component/addressbook.c:981
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -732,7 +737,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:987
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -740,25 +745,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:993
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:996
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1000
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1075
-#: calendar/gui/cal-search-bar.c:352
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1155
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -767,47 +772,46 @@ msgstr ""
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr "(ምንም)"
 
-#: addressbook/gui/component/e-address-popup.c:472
+#: addressbook/gui/component/e-address-popup.c:478
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:1782
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:608
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:615
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:630
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:911
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:995
+#: addressbook/gui/component/e-address-popup.c:998
 #: addressbook/gui/component/e-address-widget.c:392
-#: addressbook/gui/component/select-names/e-select-names-popup.c:300
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1025
+#: addressbook/gui/component/e-address-popup.c:1028
 #: addressbook/gui/component/e-address-widget.c:428
-#: addressbook/gui/component/select-names/e-select-names-popup.c:479
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1068
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr ""
 
@@ -834,73 +838,55 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
-#: mail/mail-config.glade.h:6 mail/subscribe-dialog.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
 #: addressbook/gui/component/ldap-config.glade.h:5
-msgid "1234"
+msgid "1:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:6
-msgid "1:00"
+msgid "2:30"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
-msgid "2:30"
+msgid "3268"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:8
-msgid "3268"
+msgid "389"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "380"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "389"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "5:00"
+msgid "Add LDAP Server"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "636"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "666"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "<- _Remove"
-msgstr "አስወግድ"
-
-#: addressbook/gui/component/ldap-config.glade.h:15
-msgid "<< Fewer Options"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:16
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:60
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "ሁል ጊዜ"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -909,58 +895,54 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "DN Customization"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "አጥፉ"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
+msgid "Edit LDAP Server"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "ኢሜያል አድራሻ"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "ጨርሷል"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "አጠቃላይ"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "Mappings"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:35 mail/mail-account-gui.c:62
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "በፍጹም"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -970,59 +952,33 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Objectclasses"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:40
-msgid "Objectclasses Used in Evolution:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses Used on Server:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "አንድ"
 
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid "R_estore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:46
-msgid "Re_store Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr ""
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:48
-#: calendar/gui/calendar-model.c:1977 calendar/gui/e-day-view.c:1669
-#: calendar/gui/e-week-view.c:1224
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "ተመርጠዋል፦"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -1033,7 +989,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1042,44 +998,44 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1087,7 +1043,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1096,7 +1052,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1104,7 +1060,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1114,7 +1070,7 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1124,34 +1080,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1159,82 +1115,45 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-#: mail/mail-account-gui.c:61 mail/mail-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:86
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:134 shell/glade/e-folder-list.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "ጨምር"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
-msgid "_Add ->"
-msgstr "ጨምር"
-
-#: addressbook/gui/component/ldap-config.glade.h:104
-msgid "_Add Mapping"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add to DN"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:106
-msgid "_Always"
-msgstr "ሁል ጊዜ (_A)"
-
-#: addressbook/gui/component/ldap-config.glade.h:107
-msgid "_Delete Mapping"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Distinguished Name (DN):"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Don't use SSL/TLS"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:112 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:149 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1243,145 +1162,85 @@ msgstr ""
 msgid "_Edit"
 msgstr "አስተካክል"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Edit Mapping"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:114
-msgid "_Evolution attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_If necessary "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_LDAP attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:117
-msgid "_LDAP attributes:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_More Options >>"
-msgstr "_ተጨማሪ ምርጫዎች >>"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "የ_ፖርት ቍጥር፦"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_Restore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "_የሰርቨር ስም፦"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-msgid "account-druid"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:126
-msgid "account-editor"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:129
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:130
-msgid "edit_server_window_simple"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:133
-msgid "objectclasses-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "searching-tab"
 msgstr ""
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution's addressbook name selection interface."
+msgid "Evolution Addressbook name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "ሁሉንም አስወግድ"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:162
-#: addressbook/gui/component/select-names/e-select-names.c:688
-#: composer/e-msg-composer-attachment-bar.c:505
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:502
 #: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "አስወግድ"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:177
-msgid "Remove All"
-msgstr "ሁሉንም አስወግድ"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:201
-msgid "Send HTML Mail?"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:399
-msgid "Edit Contact List"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+msgid "View Contact List"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:417
-msgid "Unnamed Contact List"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+msgid "View Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:434
-#, c-format
-msgid "(%d not shown)"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
+msgid "Send HTML Mail?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:500
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-table-model.c:349
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "ምንጭ"
 
-#: addressbook/gui/component/select-names/e-select-names.c:495
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:555
+#: addressbook/gui/component/select-names/e-select-names.c:648
 msgid "Find contact in"
 msgstr ""
 
@@ -1432,7 +1291,7 @@ msgid "Birthda_y:"
 msgstr "የልደት በዓል፦"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "ምድብ... (_T)"
@@ -1443,7 +1302,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1332
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr ""
 
@@ -1452,7 +1311,7 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:191
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "ዝርዝሮች"
 
@@ -1504,14 +1363,14 @@ msgid "Wants to receive _HTML mail"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:647 calendar/gui/e-calendar-table.c:968
-#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3539
-#: filter/filter.glade.h:15 mail/folder-browser.c:1768
-#: mail/mail-config.glade.h:147 shell/glade/e-folder-list.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
 #: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
 #: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "አጥፉ"
 
@@ -1541,14 +1400,14 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
-#: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:362
-#: addressbook/gui/widgets/e-minicard-label.c:151
-#: addressbook/gui/widgets/e-minicard-view-widget.c:118
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:473
-#: addressbook/gui/widgets/e-minicard.c:179
+#: addressbook/gui/widgets/e-minicard.c:183
 msgid "Editable"
 msgstr ""
 
@@ -2573,64 +2432,64 @@ msgstr "ዛምቢያ"
 msgid "Zimbabwe"
 msgstr "ዚምቧቤ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:158
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
-#: addressbook/gui/widgets/e-addressbook-model.c:297
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:348
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:104
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:459
 msgid "Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:165
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
 #: addressbook/gui/widgets/e-minicard-widget.c:93
-#: addressbook/gui/widgets/e-minicard.c:186
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:172
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
 msgid "Is New Card"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
 msgid "Changed"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:825
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:833
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1007
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1053
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2356
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2772,28 +2631,28 @@ msgstr ""
 msgid "_Title:"
 msgstr "አርእስት"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "List _name:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Members"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "አስወግድ"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "contact-list-editor"
 msgstr ""
 
@@ -2855,267 +2714,277 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
+#. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:117
-#: widgets/misc/e-filter-bar.c:150
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:155
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:158
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:161
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:355
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:111
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:466
 msgid "Query"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:441
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 msgid "Error getting book view"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:369
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 msgid "Model"
 msgstr "ሞዴል"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:143
-#: addressbook/gui/widgets/e-addressbook-util.c:104
-#: addressbook/gui/widgets/e-minicard.c:515
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1161
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:519 shell/e-shell.c:2102
-#: shell/e-storage.c:606 shell/evolution-shell-component.c:1200
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr "ያልታወቀ ስህተት"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:592
-#: shell/evolution-shell-component.c:1191
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1185
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2298
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
 #: camel/camel-service.c:737 camel/camel-service.c:779
-#: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: camel/camel-service.c:849 camel/camel-service.c:892
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:74
-#: calendar/gui/dialogs/save-comp.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-util.c:271
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:104
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:114
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:114
-#: addressbook/gui/widgets/e-addressbook-util.c:229
-#: addressbook/gui/widgets/e-addressbook-view.c:1742
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:196
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:327
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:332
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.c:194
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "ዓይነት"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:674
-#: addressbook/gui/widgets/e-addressbook-view.c:863
-#: addressbook/gui/widgets/e-addressbook-view.c:1870
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Go to Folder..."
 msgstr "ወደ ዶሴን ሂዱ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Import..."
 msgstr "ከውጭ አስገባ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Addressbook Sources..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866 calendar/gui/print.c:2431
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "አትም"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Copy to folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Move to folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "ቁረጥ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "ቅጂ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "ለጥፍ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879 filter/libfilter-i18n.h:10
-#: mail/mail-accounts.c:218 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "አጥፉ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
-#: calendar/gui/e-day-view.c:3674 calendar/gui/e-week-view.c:3504
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 msgid "Current View"
 msgstr "የአሁኑ ዕይታ"
 
@@ -3123,7 +2992,7 @@ msgstr "የአሁኑ ዕይታ"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:917
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3131,11 +3000,11 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:922
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1323
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3216,38 +3085,38 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:102
-#: addressbook/gui/widgets/e-minicard.c:142
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
 msgid "Width"
 msgstr "ስፋት"
 
-#: addressbook/gui/widgets/e-minicard-label.c:109
-#: addressbook/gui/widgets/e-minicard.c:149
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
 msgid "Height"
 msgstr "እርዝማኔ"
 
-#: addressbook/gui/widgets/e-minicard-label.c:116
-#: addressbook/gui/widgets/e-minicard.c:157
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:123
+#: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "መጻፊያ ሳጥን"
 
-#: addressbook/gui/widgets/e-minicard-label.c:130
+#: addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr ""
 
@@ -3271,11 +3140,11 @@ msgstr ""
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:165
+#: addressbook/gui/widgets/e-minicard.c:169
 msgid "Selected"
 msgstr "ተመርጠዋል"
 
-#: addressbook/gui/widgets/e-minicard.c:172
+#: addressbook/gui/widgets/e-minicard.c:176
 msgid "Has Cursor"
 msgstr ""
 
@@ -3370,7 +3239,6 @@ msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:638
 msgid "Landscape"
 msgstr "አግድም"
 
@@ -3390,12 +3258,11 @@ msgstr "ህዳጎች"
 msgid "Number of columns:"
 msgstr "የዐምድ ብዛት"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "&ምርጫዎች"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:625
 msgid "Orientation"
 msgstr "አቀማመጥ"
 
@@ -3416,9 +3283,7 @@ msgstr "ወረቀት"
 msgid "Paper source:"
 msgstr ""
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:631
 msgid "Portrait"
 msgstr "በቁም"
 
@@ -3474,225 +3339,221 @@ msgstr "ስፋት"
 msgid "_Font..."
 msgstr "የፊደል ቅርጽ"
 
-#: calendar/cal-util/cal-component.c:1216
+#: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr ""
 
-#: calendar/cal-util/cal-recur.c:3983 calendar/gui/print.c:455
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
 msgid "1st"
 msgstr "1ኛ"
 
-#: calendar/cal-util/cal-recur.c:3984 calendar/gui/print.c:455
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
 msgid "2nd"
 msgstr "2ኛ"
 
-#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:455
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
 msgid "3rd"
 msgstr "3ኛ"
 
-#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:455
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
 msgid "4th"
 msgstr "4ኛ"
 
-#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:455
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
 msgid "5th"
 msgstr "5ኛ"
 
-#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:456
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
 msgid "6th"
 msgstr "6ኛ"
 
-#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:456
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
 msgid "7th"
 msgstr "7ኛ"
 
-#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:456
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
 msgid "8th"
 msgstr "8ኛ"
 
-#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:456
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
 msgid "9th"
 msgstr "9ኛ"
 
-#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:456
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
 msgid "10th"
 msgstr "10ኛ"
 
-#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:457
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
 msgid "11th"
 msgstr "11ኛ"
 
-#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:457
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
 msgid "12th"
 msgstr "12ኛ"
 
-#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:457
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
 msgid "13th"
 msgstr "13ኛ"
 
-#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:457
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
 msgid "14th"
 msgstr "14ኛ"
 
-#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:457
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
 msgid "15th"
 msgstr "15ኛ"
 
-#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:458
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
 msgid "16th"
 msgstr "16ኛ"
 
-#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:458
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
 msgid "17th"
 msgstr "17ኛ"
 
-#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:458
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
 msgid "18th"
 msgstr "18ኛ"
 
-#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:458
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
 msgid "19th"
 msgstr "19ኛ"
 
-#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:458
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
 msgid "20th"
 msgstr "20ኛ"
 
-#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:459
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
 msgid "21st"
 msgstr "21ኛ"
 
-#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:459
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
 msgid "22nd"
 msgstr "22ኛ"
 
-#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:459
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
 msgid "23rd"
 msgstr "23ኛ"
 
-#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:459
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
 msgid "24th"
 msgstr "24ኛ"
 
-#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:459
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
 msgid "25th"
 msgstr "25ኛ"
 
-#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:460
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
 msgid "26th"
 msgstr "26ኛ"
 
-#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:460
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
 msgid "27th"
 msgstr "27ኛ"
 
-#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:460
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
 msgid "28th"
 msgstr "28ኛ"
 
-#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:460
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
 msgid "29th"
 msgstr "29ኛ"
 
-#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:460
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
 msgid "30th"
 msgstr "30ኛ"
 
-#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:461
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
 msgid "31st"
 msgstr "31ኛ"
 
-#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "ከፍ ያለ"
 
-#: calendar/cal-util/cal-util.c:501 calendar/cal-util/cal-util.c:523
-#: calendar/gui/calendar-model.c:1703
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "የተለመደ"
 
-#: calendar/cal-util/cal-util.c:503 calendar/cal-util/cal-util.c:525
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "ዝቅ ያለ"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:519
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 #: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:204
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1214
-#: calendar/conduits/todo/todo-conduit.c:823
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1361
-#: calendar/conduits/calendar/calendar-conduit.c:1364
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:204
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:939
-#: calendar/conduits/todo/todo-conduit.c:942
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
+msgid "Calendar and Tasks"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
+msgid "Configure your timezone, Calendar and Task List here "
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+msgid "Evolution Calendar and Tasks"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
+msgid "Evolution Calendar and Tasks component"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
+msgid "Evolution Calendar configuration control"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
+msgid "Evolution Calendar scheduling message viewer"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
+msgid "Evolution Calendar viewer"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
+msgid "Evolution Calendar/Task editor"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
+msgid "Evolution Tasks viewer"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.h:1
-msgid "Alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
@@ -3733,17 +3594,17 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:742
-#: calendar/gui/alarm-notify/alarm-queue.c:766
-#: calendar/gui/tasks-control.c:454 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "ማስጠንቀቂያ"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:746
+#: calendar/gui/alarm-notify/alarm-queue.c:849
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3751,7 +3612,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3762,7 +3623,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:786
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 msgid "Do not ask me about this program again."
 msgstr ""
 
@@ -3786,7 +3647,7 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:356 mail/mail-ops.c:1106
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr ""
 
@@ -3796,8 +3657,8 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-day-view.c:1387 calendar/gui/e-week-view-main-item.c:312
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3815,7 +3676,7 @@ msgstr "%d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:432
-#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1490
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3824,154 +3685,155 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:71 calendar/gui/gnome-cal.c:1341
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1084
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "ቀን መቁጠሪያ"
 
-#: calendar/gui/calendar-component.c:72
+#: calendar/gui/calendar-component.c:71
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:76
+#: calendar/gui/calendar-component.c:75
 msgid "Public Calendar"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:77
+#: calendar/gui/calendar-component.c:76
 msgid "Public folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:81 calendar/gui/e-tasks.c:735
-#: calendar/gui/print.c:1776 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:705
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:326
-#: my-evolution/e-summary-tasks.c:344 shell/e-local-storage.c:183
-#: shell/e-shortcuts.c:1085
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:82
+#: calendar/gui/calendar-component.c:81
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:86
+#: calendar/gui/calendar-component.c:85
 msgid "Public Tasks"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:87
+#: calendar/gui/calendar-component.c:86
 msgid "Public folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:739
+#: calendar/gui/calendar-component.c:730
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:739
+#: calendar/gui/calendar-component.c:730
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:740
+#: calendar/gui/calendar-component.c:731
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:744
+#: calendar/gui/calendar-component.c:735
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:744
+#: calendar/gui/calendar-component.c:735
 msgid "_Meeting"
 msgstr "ስብሰባ"
 
-#: calendar/gui/calendar-component.c:745
+#: calendar/gui/calendar-component.c:736
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:749
+#: calendar/gui/calendar-component.c:740
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:749
+#: calendar/gui/calendar-component.c:740
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:750
+#: calendar/gui/calendar-component.c:741
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:754
+#: calendar/gui/calendar-component.c:745
 msgid "New All Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:754
+#: calendar/gui/calendar-component.c:745
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:755
+#: calendar/gui/calendar-component.c:746
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:406 calendar/gui/calendar-model.c:965
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
 #: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:409 calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
 #: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "ሚስጢራዊ"
 
-#: calendar/gui/calendar-model.c:412 calendar/gui/e-calendar-table.c:371
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:524
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "n"
 
-#: calendar/gui/calendar-model.c:524
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "s"
 
-#: calendar/gui/calendar-model.c:526
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "ምሥራቅ"
 
-#: calendar/gui/calendar-model.c:526
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "ምዕራብ"
 
-#: calendar/gui/calendar-model.c:591 calendar/gui/calendar-model.c:1135
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
 #: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "ነፃ"
 
-#: calendar/gui/calendar-model.c:593 calendar/gui/e-calendar-table.c:446
-#: calendar/gui/e-meeting-time-sel.c:409
-#: shell/evolution-shell-component.c:1185
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:744 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2289
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1181
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2292
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:305
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/print.c:2295
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1037
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3979,32 +3841,32 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1177 calendar/gui/dialogs/meeting-page.c:288
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1978
-#: mail/folder-browser.c:1730 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1655 mail/mail-accounts.c:386
-#: mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:196
-#: widgets/misc/e-cell-date-edit.c:254 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1481 widgets/misc/e-dateedit.c:1596
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:79
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "ምንም"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:277
-#: calendar/gui/e-meeting-model.c:287 calendar/gui/e-meeting-model.c:543
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
 #: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr "አዎ"
 
-#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
 #: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "አይ"
@@ -4025,47 +3887,53 @@ msgstr "የሳመንት ዕይታ"
 msgid "Month View"
 msgstr "የወር ዕይታ"
 
+#: calendar/gui/comp-editor-factory.c:456
+msgid "Error while opening the calendar"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:473
+msgid "Permission denied to open the calendar"
+msgstr ""
+
 #: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr ""
 
-#: calendar/gui/control-factory.c:163
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/control-factory.c:170
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:358
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:367
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:376
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+msgid "Email Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:385
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:394
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
-msgid "Alarm Repeat"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
+msgid "Alarm Repeat"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:3
@@ -4073,148 +3941,52 @@ msgid "Message to Display"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "መልዕክት"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "ድምፅ አጫውት፦"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "ፕሮግራምን አስኪድ፦"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "ላክ"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:68
-#: filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
 msgid "days"
 msgstr "ቀን"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:67
-#: filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "ሰዓትን"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:66
-#: filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "ደቂቃዎች"
 
-#: calendar/gui/dialogs/alarm-page.c:313 calendar/gui/e-alarm-list.c:393
-#, c-format
-msgid "%d days"
-msgstr "%d ቀን"
-
-#: calendar/gui/dialogs/alarm-page.c:316 calendar/gui/e-alarm-list.c:396
-msgid "1 day"
-msgstr "1 ቀን"
-
-#: calendar/gui/dialogs/alarm-page.c:321 calendar/gui/e-alarm-list.c:401
-#, c-format
-msgid "%d weeks"
-msgstr "%d ሳመንት"
-
-#: calendar/gui/dialogs/alarm-page.c:324 calendar/gui/e-alarm-list.c:404
-msgid "1 week"
-msgstr "1 ሳመንት"
-
-#: calendar/gui/dialogs/alarm-page.c:329 calendar/gui/e-alarm-list.c:409
-#, c-format
-msgid "%d hours"
-msgstr "%d ሰዓት"
-
-#: calendar/gui/dialogs/alarm-page.c:332 calendar/gui/e-alarm-list.c:412
-msgid "1 hour"
-msgstr "1 ሰዓት"
-
-#: calendar/gui/dialogs/alarm-page.c:337 calendar/gui/e-alarm-list.c:417
-#, c-format
-msgid "%d minutes"
-msgstr "%d ደቂቃዎች"
-
-#: calendar/gui/dialogs/alarm-page.c:340 calendar/gui/e-alarm-list.c:420
-msgid "1 minute"
-msgstr "1 ደቂቃ"
-
-#: calendar/gui/dialogs/alarm-page.c:345 calendar/gui/e-alarm-list.c:425
-#, c-format
-msgid "%d seconds"
-msgstr "%d ሴኮንዶች"
-
-#: calendar/gui/dialogs/alarm-page.c:348 calendar/gui/e-alarm-list.c:428
-msgid "1 second"
-msgstr "1 ሴኮንድ"
-
-#: calendar/gui/dialogs/alarm-page.c:377
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
-msgid "Play a sound"
-msgstr "ድምፅ አጫውት"
-
-#: calendar/gui/dialogs/alarm-page.c:381
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
-msgid "Display a message"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:385 calendar/gui/e-alarm-list.c:465
-msgid "Send an email"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:389
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
-msgid "Run a program"
-msgstr "ፕሮግራምን አስኪድ"
-
-#: calendar/gui/dialogs/alarm-page.c:395 calendar/gui/e-alarm-list.c:475
-msgid "Unknown action to be performed"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:407 calendar/gui/e-alarm-list.c:487
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:410 calendar/gui/e-alarm-list.c:490
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:415 calendar/gui/e-alarm-list.c:495
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:424 calendar/gui/e-alarm-list.c:504
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:427 calendar/gui/e-alarm-list.c:507
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:432 calendar/gui/e-alarm-list.c:512
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:456 calendar/gui/e-alarm-list.c:536
-#, c-format
-msgid "%s at %s"
-msgstr "%s በ %s"
-
-#: calendar/gui/dialogs/alarm-page.c:462 calendar/gui/e-alarm-list.c:542
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4225,46 +3997,62 @@ msgstr ""
 msgid "Date/Time:"
 msgstr "ቀን/ሰዓት፦"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "ድምፅ አጫውት"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "ፕሮግራምን አስኪድ"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an Email"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "ማጠቃለያ፦"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "ምርጫዎች... (_O)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "በኋላ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "ቀድሞ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "ቀን(ኦች)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "ሰዓት(ኦች)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:179
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "ደቂቃ(ዎች)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr ""
 
@@ -4313,8 +4101,8 @@ msgid "Days"
 msgstr "ቀን"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:586
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "ዓርብ"
 
@@ -4327,8 +4115,8 @@ msgid "Minutes"
 msgstr "ደቂቃዎች"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:582
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "ሰኞ"
 
@@ -4337,8 +4125,8 @@ msgid "S_un"
 msgstr "_እሑድ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1051
-#: calendar/gui/e-itip-control.c:587
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "ቅዳሜ"
 
@@ -4351,8 +4139,8 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1052
-#: calendar/gui/e-itip-control.c:581
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "እሑድ"
 
@@ -4369,8 +4157,8 @@ msgid "Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:585
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "ሐሙስ"
 
@@ -4387,8 +4175,8 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "ማክሰኞ"
 
@@ -4397,8 +4185,8 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:584
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "ረቡዕ"
 
@@ -4480,33 +4268,33 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:55
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:64
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:73
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
@@ -4559,79 +4347,78 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2207
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr "ወደ"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2211
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2213
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2218
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2220
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:328
 msgid "Could not update invalid object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:325
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:328
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:331
+#: calendar/gui/dialogs/comp-editor.c:337
 msgid "Could not update object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:777
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:782
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:785
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:788
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:799
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1206
-#: calendar/gui/e-calendar-table.c:1035 calendar/gui/e-day-view.c:3929
-#: calendar/gui/e-week-view.c:3737 composer/e-msg-composer.c:1155
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1307
 #: calendar/gui/dialogs/comp-editor.c:1331
 #: calendar/gui/dialogs/comp-editor.c:1355
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1379
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4689,103 +4476,98 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:197 calendar/gui/print.c:2246
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:212
-#: calendar/gui/dialogs/event-editor.c:279
-#: calendar/gui/dialogs/event-editor.c:412
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:217
-#: calendar/gui/dialogs/event-editor.c:282
-#: calendar/gui/dialogs/event-editor.c:415 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "ስብሰባ"
 
-#: calendar/gui/dialogs/event-page.c:644 calendar/gui/dialogs/task-page.c:546
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:654
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:677
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:684
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "ሚስጢራዊ"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "ቀን እና ሰዓት"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "_ነፃ"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "_ቦታ"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "ማጠቃለያ"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr ""
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr ""
@@ -4794,19 +4576,23 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:391
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:415
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:643
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4846,14 +4632,14 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "ሁኔታ"
@@ -4868,55 +4654,81 @@ msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:427
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:550
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:75
+#, fuzzy
+msgid "This and Future Instances"
+msgstr "ዋሊስ እና ፉቱና ደሴቶች"
+
+#: calendar/gui/dialogs/recur-comp.c:77
+msgid "All Instances"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:824
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:929
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "አብራ"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr "መጀመሪያ"
 
-#: calendar/gui/dialogs/recurrence-page.c:991 filter/filter-datespec.c:65
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "ሁለተኛ"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:993
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:994
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr "መጨረሻ"
 
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:1004
 msgid "Other Date"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1045 filter/filter-datespec.c:68
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "ቀን ኦች"
 
-#: calendar/gui/dialogs/recurrence-page.c:1182
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1367
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr ""
 
@@ -4980,23 +4792,23 @@ msgstr "ሳመንት"
 msgid "year(s)"
 msgstr "ዓመት"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:65
+#: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:69
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:398
+#: calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr ""
 
@@ -5010,44 +4822,38 @@ msgstr ""
 msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:295 calendar/gui/e-meeting-model.c:318
-#: calendar/gui/e-meeting-model.c:549 calendar/gui/e-meeting-model.c:851
-msgid "Needs Action"
-msgstr ""
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "ይሻሻል"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:630
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr "url"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "ቅድሚያ"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "ሁኔታ"
 
-#: calendar/gui/dialogs/task-editor.c:186
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "ቀላል"
 
-#: calendar/gui/dialogs/task-editor.c:196
-#: calendar/gui/dialogs/task-editor.c:241
-#: calendar/gui/dialogs/task-editor.c:366
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:519
+#: calendar/gui/dialogs/task-page.c:527
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1012
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
@@ -5057,124 +4863,232 @@ msgstr "መግለጫ"
 msgid "Sta_rt Date:"
 msgstr ""
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr ""
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
 
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d ቀን"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 ቀን"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d ሳመንት"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 ሳመንት"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d ሰዓት"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 ሰዓት"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d ደቂቃዎች"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 ደቂቃ"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d ሴኮንዶች"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 ሴኮንድ"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s በ %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/e-calendar-table.c:415
+#, c-format
 msgid "0%"
 msgstr "+0"
 
 #: calendar/gui/e-calendar-table.c:416
+#, c-format
 msgid "10%"
 msgstr "10"
 
 #: calendar/gui/e-calendar-table.c:417
+#, c-format
 msgid "20%"
 msgstr "20"
 
 #: calendar/gui/e-calendar-table.c:418
+#, c-format
 msgid "30%"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:419
+#, c-format
 msgid "40%"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:420
+#, c-format
 msgid "50%"
 msgstr "50%"
 
 #: calendar/gui/e-calendar-table.c:421
+#, c-format
 msgid "60%"
 msgstr "60"
 
 #: calendar/gui/e-calendar-table.c:422
+#, c-format
 msgid "70%"
 msgstr "70"
 
 #: calendar/gui/e-calendar-table.c:423
+#, c-format
 msgid "80%"
 msgstr "80"
 
 #: calendar/gui/e-calendar-table.c:424
+#, c-format
 msgid "90%"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:425
+#, c-format
 msgid "100%"
 msgstr "100"
 
-#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2824
-#: calendar/gui/e-week-view.c:1901
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1910
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:949 calendar/gui/e-day-view.c:3696
-#: calendar/gui/e-week-view.c:3521 mail/folder-browser.c:1741
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
 #: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "ክፈት"
 
-#: calendar/gui/e-calendar-table.c:950
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr "በሌላ ስም አስቀምጥ"
 
-#: calendar/gui/e-calendar-table.c:951 calendar/gui/e-day-view.c:3698
-#: calendar/gui/e-week-view.c:3496 calendar/gui/e-week-view.c:3523
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "አትም"
 
-#: calendar/gui/e-calendar-table.c:955 calendar/gui/e-day-view.c:3703
-#: calendar/gui/e-week-view.c:3528 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "ቁረጥ"
 
-#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3704
-#: calendar/gui/e-week-view.c:3529 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "ቅጂ"
 
-#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3669
-#: calendar/gui/e-day-view.c:3705 calendar/gui/e-week-view.c:3500
-#: calendar/gui/e-week-view.c:3530 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "ለጥፍ"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:962
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:963
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:964
+#: calendar/gui/e-calendar-table.c:965
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1239 calendar/gui/e-day-view.c:7551
-#: calendar/gui/e-week-view.c:4215
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1322
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -5183,8 +5097,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1000
-#: camel/camel-filter-driver.c:1095
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr ""
 
@@ -5213,8 +5127,8 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:56 shell/e-shell.c:765
-#: shell/e-shortcuts.c:1081
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "ማጠቃለያ"
 
@@ -5242,540 +5156,540 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:531
+#: calendar/gui/e-day-view-time-item.c:529
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:262 calendar/gui/e-day-view.c:1373
-#: calendar/gui/e-week-view-main-item.c:303 calendar/gui/print.c:1506
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:270 calendar/gui/e-day-view.c:1400
-#: calendar/gui/e-week-view-main-item.c:326
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:610 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:790
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
 msgid "am"
 msgstr "ጠዋት"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:613 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:792
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
 msgid "pm"
 msgstr "ከሳዓት"
 
-#: calendar/gui/e-day-view.c:3653
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3655 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3657 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3659 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3664 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "አትም"
 
-#: calendar/gui/e-day-view.c:3676 calendar/gui/e-week-view.c:3506
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3678 calendar/gui/e-week-view.c:3507
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3511
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3688 calendar/gui/e-week-view.c:3515
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
+#: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "ምርጫዎች"
 
-#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3522
-#: mail/folder-browser.c:1743 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "በሌላ ስም አስቀምጥ"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3534
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3710 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3716 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:627
+#: calendar/gui/e-itip-control.c:716
 msgid "Every day"
 msgstr "በየቀን"
 
-#: calendar/gui/e-itip-control.c:629
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "Every %d days"
 msgstr "በየ%d ቀን"
 
-#: calendar/gui/e-itip-control.c:635
+#: calendar/gui/e-itip-control.c:724
 msgid "Every week"
 msgstr "በየሳመንት"
 
-#: calendar/gui/e-itip-control.c:637
+#: calendar/gui/e-itip-control.c:726
 #, c-format
 msgid "Every %d weeks"
 msgstr "በየ%d ሳመንት"
 
-#: calendar/gui/e-itip-control.c:640
+#: calendar/gui/e-itip-control.c:729
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "Every %d weeks on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:739
 msgid " and "
 msgstr " እና "
 
-#: calendar/gui/e-itip-control.c:657
+#: calendar/gui/e-itip-control.c:746
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:759
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:764
 msgid "every month"
 msgstr "በየወር"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:769
 #, c-format
 msgid "every %d months"
 msgstr "በየ%d ወር"
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:775
 msgid "Every year"
 msgstr "በየ ዓመት"
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every %d years"
 msgstr "በየ%d ዓመታት"
 
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:789
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:708
+#: calendar/gui/e-itip-control.c:797
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-itip-control.c:859
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:824
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:890 calendar/gui/e-itip-control.c:906
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>ምንም</i>"
 
-#: calendar/gui/e-itip-control.c:966
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "ቦታ፦"
 
-#: calendar/gui/e-itip-control.c:980
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "ሁኔታ፦"
 
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-meeting-model.c:297
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:852
-#: calendar/gui/itip-utils.c:486
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989 calendar/gui/itip-utils.c:489
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:993 calendar/gui/e-meeting-model.c:299
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:853
-#: calendar/gui/itip-utils.c:492 calendar/gui/itip-utils.c:518
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:997 calendar/gui/e-itip-control.c:1203
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:268
-#: calendar/gui/e-meeting-model.c:333 calendar/gui/e-meeting-model.c:810
-#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1531
-#: camel/camel-gpg-context.c:1581 camel/camel-tcp-stream-openssl.c:629
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:345
-#: mail/mail-display.c:920 widgets/misc/e-charset-picker.c:59
-#: widgets/misc/e-charset-picker.c:446
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "ያልታወቀ"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.c:1078
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: calendar/gui/e-itip-control.c:1130 calendar/gui/e-itip-control.c:1143
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "አሻሽል"
 
-#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1106 calendar/gui/e-itip-control.c:1119
-#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
-#: shell/e-shell.c:2092 widgets/misc/e-cell-date-edit.c:262
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "እሺ"
 
-#: calendar/gui/e-itip-control.c:1079
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1080
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1144 calendar/gui/itip-utils.c:506
-#: shell/evolution-shell-component.c:1163 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ተወው"
 
-#: calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1233
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1243
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1244
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1251
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1252
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1267 calendar/gui/e-itip-control.c:1334
-#: calendar/gui/e-itip-control.c:1369
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1292
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1293
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1310
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1311
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1355
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1359
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1360
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1506
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1534 calendar/gui/e-itip-control.c:1540
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1787 calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1882
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1885
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1796
+#: calendar/gui/e-itip-control.c:1916
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1799
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1802
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1831 calendar/gui/e-itip-control.c:1897
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1888
+#: calendar/gui/e-itip-control.c:2008
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1891
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1894
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1929
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1959 calendar/gui/e-itip-control.c:2009
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1961 calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2086
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2093
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr ""
 
@@ -5816,87 +5730,92 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1736
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:83
 msgid "Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:208 calendar/gui/e-meeting-model.c:225
-#: calendar/gui/e-meeting-model.c:539 calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:210 calendar/gui/e-meeting-model.c:227
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
 #: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "የውይይት መድረክ"
 
-#: calendar/gui/e-meeting-model.c:212 calendar/gui/e-meeting-model.c:229
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
 #: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:214 calendar/gui/e-meeting-model.c:231
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
 #: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:260
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
 #: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:245 calendar/gui/e-meeting-model.c:262
-#: calendar/gui/e-meeting-model.c:541 calendar/gui/e-meeting-model.c:823
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:247 calendar/gui/e-meeting-model.c:264
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
 #: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:249 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
 #: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:301 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+msgid "Needs Action"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:303 calendar/gui/e-meeting-model.c:326
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
 #: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2078
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2108 e-util/e-time-utils.c:189
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
 #: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
@@ -5904,92 +5823,92 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
-#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1605
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:410 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:449
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "ምርጫዎች (_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:469
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:483
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:501
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:519
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:569
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:582
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:595
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:608
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:650
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:356 calendar/gui/gnome-cal.c:2011
-#: calendar/gui/gnome-cal.c:2022
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:385 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:400
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:414 calendar/gui/gnome-cal.c:1531
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:482 calendar/gui/gnome-cal.c:1735
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6008,7 +5927,7 @@ msgstr ""
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3489
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr ""
 
@@ -6043,12 +5962,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1993
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2033
+#: calendar/gui/gnome-cal.c:2035
 msgid "Opening default tasks folder"
 msgstr ""
 
@@ -6108,172 +6027,173 @@ msgstr "ኦክተውበር"
 msgid "September"
 msgstr "ሴፕቴምበር"
 
-#: calendar/gui/itip-utils.c:344 calendar/gui/itip-utils.c:415
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:379
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:458 calendar/gui/itip-utils.c:567
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "የኩነቶች መረጃ"
 
-#: calendar/gui/itip-utils.c:460 calendar/gui/itip-utils.c:569
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:588
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:466
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:510
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "በድጋሚ ጀምር"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:582
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:594
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:752
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "እ"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "ሳ"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "ማ"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "ረ"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "ሐ"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "ዓ"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "ቅ"
 
 #. Day
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1887 calendar/gui/print.c:1891
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1888
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1892 calendar/gui/print.c:1894
-#: calendar/gui/print.c:1895
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1899
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1907
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1914
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2248
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2305
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "ሁኔታ፦ %s"
 
-#: calendar/gui/print.c:2323
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "ቅድሚያ፦ %s"
 
-#: calendar/gui/print.c:2337
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2349
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr "URL፦ %s"
 
-#: calendar/gui/print.c:2363
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr "ምድቦች፦ %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2522 calendar/gui/print.c:2616
-#: calendar/gui/tasks-control.c:591 mail/mail-callbacks.c:2930
-#: my-evolution/e-summary.c:617
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "የቅድመ ህትመት ዕይታ"
 
-#: calendar/gui/print.c:2553
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2636
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "የህትመት ቅንጅት"
 
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:472
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6281,86 +6201,60 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:622
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:108
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:120
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:133
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:379
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:2
-msgid "Imports iCalendar files into Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+msgid "Evolution iCalendar importer"
 msgstr ""
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:3
-msgid "Imports vCalendar files into Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+msgid "Evolution vCalendar importer"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:169
-#, c-format
-msgid "Can't get storage list from registry: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+msgid "iCalendar files (.ics)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:181
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:484
+#: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:698
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "የቀን መቁጠሪያ ኩነቶች"
 
-#: calendar/importers/icalendar-importer.c:723
+#: calendar/importers/icalendar-importer.c:663
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:730
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr ""
 
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr ""
@@ -8022,11 +7916,11 @@ msgstr ""
 msgid "You may not export keys with this cipher"
 msgstr ""
 
-#: camel/camel-data-cache.c:137
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:375
+#: camel/camel-data-cache.c:370
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
@@ -8060,102 +7954,109 @@ msgstr ""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:767 camel/camel-filter-driver.c:776
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
+#, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr ""
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-process.c:92
+#, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr ""
+
+#: camel/camel-filter-driver.c:744
+#, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr ""
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:865 camel/camel-filter-driver.c:1238
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:874 camel/camel-filter-driver.c:1244
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:941
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:950
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:965
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:969
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:970 camel/camel-filter-driver.c:982
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:996 camel/camel-filter-driver.c:1090
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1057
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1072
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:514
-#, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr ""
-
-#: camel/camel-filter-search.c:550
-#, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr ""
-
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -8206,9 +8107,9 @@ msgid ""
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1246
-#: camel/camel-gpg-context.c:1353 camel/camel-gpg-context.c:1428
-#: camel/camel-gpg-context.c:1485 mail/mail-send-recv.c:565
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr ""
 
@@ -8229,7 +8130,7 @@ msgstr ""
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1122
+#: camel/camel-gpg-context.c:1125
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8237,24 +8138,24 @@ msgid ""
 "%.*s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1131
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1237 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1580
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1267 camel/camel-gpg-context.c:1345
-#: camel/camel-gpg-context.c:1419 camel/camel-gpg-context.c:1449
-#: camel/camel-gpg-context.c:1476 camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1330
+#: camel/camel-gpg-context.c:1333
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8365,11 +8266,11 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:625
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:679
+#: camel/camel-multipart-signed.c:682
 msgid "parse error"
 msgstr ""
 
@@ -8431,119 +8332,123 @@ msgid ""
 "the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:40
+#: camel/camel-sasl-gssapi.c:48
 msgid "GSSAPI"
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:42
+#: camel/camel-sasl-gssapi.c:50
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:133
+#: camel/camel-sasl-gssapi.c:148
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:138
+#: camel/camel-sasl-gssapi.c:153
 msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:141
+#: camel/camel-sasl-gssapi.c:156
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:145
+#: camel/camel-sasl-gssapi.c:160
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:150
+#: camel/camel-sasl-gssapi.c:165
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:154
+#: camel/camel-sasl-gssapi.c:169
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:159
-msgid ""
-"Indicates that the supplied context handle did not refer to a valid context."
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:163
-msgid "Indicates that consistency checks performed on the input_token failed."
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:167
+#: camel/camel-sasl-gssapi.c:180
 msgid "The consistency checks performed on the credential failed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:170
+#: camel/camel-sasl-gssapi.c:183
 msgid "The referenced credentials have expired."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:177 camel/camel-sasl-gssapi.c:222
-#: camel/camel-sasl-gssapi.c:257 camel/camel-sasl-gssapi.c:273
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1049
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:281
+#: camel/camel-sasl-gssapi.c:213
+#, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:299
 msgid "Unsupported security layer."
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8596,7 +8501,7 @@ msgstr ""
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
@@ -8621,30 +8526,30 @@ msgstr ""
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:773 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 msgid "Resolving address"
 msgstr ""
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8713,123 +8618,123 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:806
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8838,15 +8743,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:812
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:812
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8859,7 +8764,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:816
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8869,35 +8774,35 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:860
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:912
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:930
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -8912,39 +8817,39 @@ msgstr ""
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:272
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:291
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:304
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:312
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:452
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8967,16 +8872,16 @@ msgstr ""
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:462
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:654
+#: camel/providers/imap/camel-imap-command.c:655
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:690
+#: camel/providers/imap/camel-imap-command.c:691
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
@@ -9066,7 +8971,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1134
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "ዶሴዎች"
 
@@ -9096,7 +9001,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "ሚስጢራዊ ቃል"
 
@@ -9114,58 +9019,57 @@ msgstr ""
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1072
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1082
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1106
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1121
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9173,24 +9077,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1495
-#: camel/providers/imap/camel-imap-store.c:1637
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1838
+#: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1850
+#: camel/providers/imap/camel-imap-store.c:1851
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1886
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9264,7 +9168,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -9290,7 +9194,7 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:904
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
@@ -9336,7 +9240,7 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9346,14 +9250,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:169
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9379,8 +9283,8 @@ msgid "not a maildir directory"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:283
-#: camel/providers/local/camel-spool-store.c:313
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -9400,10 +9304,10 @@ msgid "Checking for new messages"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:679
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr ""
 
@@ -9479,75 +9383,75 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:351
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:399
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:455
+#: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:593
-#: camel/providers/local/camel-mbox-summary.c:684
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: camel/providers/local/camel-mbox-summary.c:605
-#: camel/providers/local/camel-spool-summary.c:170
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:618
-#: camel/providers/local/camel-mbox-summary.c:780
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:627
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:638
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:722
-#: camel/providers/local/camel-mbox-summary.c:730
-#: camel/providers/local/camel-mbox-summary.c:921
-#: camel/providers/local/camel-mbox-summary.c:929
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:855
-#: camel/providers/local/camel-spool-summary.c:342
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ያልታወቀ ስህተት፦ %s"
 
-#: camel/providers/local/camel-mbox-summary.c:890
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:984
-#: camel/providers/local/camel-mbox-summary.c:1010
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -9572,63 +9476,63 @@ msgstr ""
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:177
+#: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:194
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:206
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:206
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool folder tree %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:214
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:183
-#: camel/providers/local/camel-spool-summary.c:193
-#: camel/providers/local/camel-spool-summary.c:203
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:219
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:250
-#: camel/providers/local/camel-spool-summary.c:269
-#: camel/providers/local/camel-spool-summary.c:282
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -9756,7 +9660,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr ""
 
@@ -9777,66 +9681,66 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:523
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:615
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr ""
 
@@ -9846,49 +9750,49 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9896,135 +9800,135 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:342
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
@@ -10063,61 +9967,61 @@ msgstr ""
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "HELO response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10125,67 +10029,67 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:536
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -10221,7 +10125,7 @@ msgstr ""
 msgid "Hey you, dunce. You need an account to send mail doncha know."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:480
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr ""
 
@@ -10232,45 +10136,45 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:512
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:523
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "ከ፦"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:529
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "ጉዳዩ፦"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "ወደ፦"
 
-#: composer/e-msg-composer-hdrs.c:544
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:547
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc፦"
 
-#: composer/e-msg-composer-hdrs.c:548
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:551
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc፦"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10279,11 +10183,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:559
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:561
+#: composer/e-msg-composer-hdrs.c:549
 msgid "Posting destination"
 msgstr ""
 
@@ -10292,75 +10196,75 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:526
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr ""
 
-#: composer/e-msg-composer.c:805
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1168
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1186
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1209
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1244
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1259
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1266
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1275
+#: composer/e-msg-composer.c:1285
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1284
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1540
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10368,37 +10272,38 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1545
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: composer/e-msg-composer.c:1549
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1581
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "ፋይል ክፈት"
 
-#: composer/e-msg-composer.c:1939
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:1979 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2158 composer/e-msg-composer.c:2753
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2784
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2810
+#: composer/e-msg-composer.c:2931
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10406,28 +10311,18 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:2870
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3886
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:417
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-
-#: composer/evolution-composer.c:432
-msgid "Cannot initialize the Evolution composer."
-msgstr ""
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr ""
@@ -10573,17 +10468,21 @@ msgid ""
 "ping_timeout_callback: could not determine if the CORBA object is nil or not"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:230
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-passwords.c:345
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr ""
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
 
-#: e-util/e-passwords.c:347
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10666,13 +10565,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
-#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr "i p,"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
-#: widgets/misc/e-dateedit.c:1424 widgets/misc/e-dateedit.c:1637
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr "h"
 
@@ -10681,42 +10580,74 @@ msgstr "h"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:65 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:180
-msgid "seconds"
-msgstr "ሴኮንዶች"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 ሴኮንድ"
+
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d ሴኮንዶች"
 
 #: filter/filter-datespec.c:66
-msgid "minute"
-msgstr "ደቂቃ"
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 ደቂቃ"
+
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d ደቂቃዎች"
 
 #: filter/filter-datespec.c:67
-msgid "hour"
-msgstr "ሰዓት"
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 ሰዓት"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d ሰዓት"
+
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 ቀን"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr "%d ቀን"
 
 #: filter/filter-datespec.c:69
-msgid "week"
-msgstr "ሳመንት"
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 ሳመንት"
 
-#: filter/filter-datespec.c:69 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "ሳመንታት"
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d ሳመንት"
 
 #: filter/filter-datespec.c:70
-msgid "month"
+#, fuzzy
+msgid "1 month ago"
 msgstr "ወር"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:23
-msgid "months"
-msgstr "ወር"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr "በየ%d ወር"
 
 #: filter/filter-datespec.c:71
-msgid "year"
-msgstr "ዓመት"
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:71 filter/filter.glade.h:33
-msgid "years"
-msgstr "ዓመታት"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr "በየ%d ዓመታት"
 
 #: filter/filter-datespec.c:176
 msgid "You must choose a date."
@@ -10735,17 +10666,11 @@ msgstr "አሁኑኑ"
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:298 filter/filter-datespec.c:301
-#, c-format
-msgid "%d %s ago"
-msgstr ""
-
-#: filter/filter-datespec.c:417
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr ""
 
-#: filter/filter-editor.c:115 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr ""
 
@@ -10758,7 +10683,7 @@ msgstr ""
 msgid "File '%s' does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-file.c:293
+#: filter/filter-file.c:298
 msgid "Choose a file"
 msgstr ""
 
@@ -10767,12 +10692,12 @@ msgstr ""
 msgid "Then"
 msgstr ""
 
-#: filter/filter-folder.c:153
+#: filter/filter-folder.c:155
 msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-folder.c:241 filter/vfolder-rule.c:406
-#: mail/mail-account-gui.c:1475 mail/mail-account-gui.c:1489
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "ዶሴ ምረጡ"
 
@@ -10783,30 +10708,32 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:68
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
 msgid "Important"
 msgstr "አስፈላጊ"
 
 #. red
 #: filter/filter-label.c:122 mail/mail-config.c:69
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 msgid "Work"
 msgstr "መሥራት"
 
 #. orange
-#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1281
 msgid "Personal"
 msgstr "የግል"
 
 #. forest green
 #: filter/filter-label.c:124 mail/mail-config.c:71
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:67
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1283
 msgid "Later"
 msgstr ""
 
@@ -10888,7 +10815,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:115
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr ""
 
@@ -10900,6 +10827,14 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "ወር"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "ሴኮንዶች"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr ""
@@ -10916,6 +10851,10 @@ msgstr ""
 msgid "vFolder Sources"
 msgstr ""
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "ሳመንታት"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
@@ -10928,6 +10867,10 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "ዓመታት"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -10950,225 +10893,226 @@ msgid "Beep"
 msgstr ""
 
 #: filter/libfilter-i18n.h:7
-msgid "Copy to Folder"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
-msgid "Date received"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
+msgid "Date received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "የጠፋ"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr ""
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "ንድፍ"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
+msgid "does not return"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1778
-msgid "Label"
-msgstr "መለያ"
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr ""
+msgid "Draft"
+msgstr "ንድፍ"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr "ድምፅ አጫውት"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "አንብብ"
+msgid "Expression"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr ""
+msgid "is"
+msgstr "ነው"
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
+msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "ነጥብ"
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr ""
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1812
-msgid "Sender"
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
 msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "Set Status"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Shell Command"
-msgstr "የሼሉን ትእዛዝ"
+msgid "is less than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "መጠን kb"
+msgid "is not"
+msgstr "አይደለም"
 
 #: filter/libfilter-i18n.h:34
-msgid "Source Account"
+msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
-msgid "Specific header"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
+msgid "Label"
+msgstr "መለያ"
+
+#: filter/libfilter-i18n.h:36
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "Stop Processing"
+msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:906
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
-#: mail/message-tags.glade.h:4
-msgid "Subject"
-msgstr "ጉዳዩ"
+#: filter/libfilter-i18n.h:38
+msgid "Message Header"
+msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "Unset Status"
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "contains"
+msgid "Pipe Message to Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr ""
+msgid "Play Sound"
+msgstr "ድምፅ አጫውት"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr ""
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "አንብብ"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not exist"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "does not return"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "does not sound like"
+msgid "Replied to"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "does not start with"
+msgid "returns"
 msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "ends with"
+msgid "returns greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "exists"
+msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr ""
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "ነጥብ"
 
-#: filter/libfilter-i18n.h:50
-msgid "is after"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:51
-msgid "is before"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr ""
+msgid "Shell Command"
+msgstr "የሼሉን ትእዛዝ"
 
 #: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr ""
+msgid "Size (kB)"
+msgstr "መጠን kb"
 
 #: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "አይደለም"
+msgid "Source Account"
+msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "ነው"
-
-#: filter/libfilter-i18n.h:57
-msgid "returns greater than"
+msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:59
-msgid "returns"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr ""
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
+msgid "Subject"
+msgstr "ጉዳዩ"
 
 #: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr ""
-
-#: filter/rule-editor.c:170
-msgid "Rules"
+msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-editor.c:241 filter/rule-editor.c:325
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
+#: filter/rule-editor.c:170
+msgid "Rules"
+msgstr ""
+
 #: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr ""
@@ -11185,11 +11129,11 @@ msgstr ""
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:220
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -11197,45 +11141,50 @@ msgstr ""
 msgid "VFolder source"
 msgstr ""
 
-#: importers/elm-importer.c:95
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr ""
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr ""
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:113
-#: mail/folder-browser-ui.c:357
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
 msgstr "ፖስታ"
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr ""
 
@@ -11245,12 +11194,12 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11265,7 +11214,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11273,7 +11222,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11282,53 +11231,55 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1092
-#: shell/e-local-storage.c:184
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "የማይፈለግ"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr ""
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:2047 shell/e-shell-startup-wizard.c:647
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "ምርጫዎች"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr ""
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr ""
 
@@ -11337,56 +11288,56 @@ msgid "Composer Preferences"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configuration control for the Evolution Mailer."
+msgid "Configure the fonts used by Evolution here"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
+msgid "Configure your email accounts here"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Evolution Mail"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Configure spell-checking, signatures, and the message composer here"
+msgid "Evolution Mail accounts configuration control"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Configure the fonts used by Evolution here"
+msgid "Evolution Mail component"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Configure your email accounts here"
+msgid "Evolution Mail composer"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
+msgid "Evolution Mail composer configuration control"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
+msgid "Evolution Mail configuration interface"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
+msgid "Evolution Mail folder viewer"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
+msgid "Evolution Mail font configuration control"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "Factory for the controls exported by the Evolution Mailer"
+msgid "Evolution Mail preferences control"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
@@ -11397,114 +11348,98 @@ msgstr "የፊደል ቅርጽ ምርጫዎች"
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr ""
-
-#: mail/component-factory.c:113
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr ""
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:143
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:437
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "ምርጫዎች..."
 
-#: mail/component-factory.c:437
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:988
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:1012
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1053
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1069
 msgid "New Message Post"
 msgstr ""
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr ""
 
-#: mail/component-factory.c:1062
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr ""
 
-#: mail/component-factory.c:1090
-msgid "Cannot initialize the Evolution mail component."
-msgstr ""
-
-#: mail/component-factory.c:1099
-msgid "Cannot initialize Evolution's mail config component."
-msgstr ""
-
-#: mail/component-factory.c:1105
-msgid "Cannot initialize Evolution's folder info component."
-msgstr ""
-
-#: mail/component-factory.c:1349 mail/component-factory.c:1379
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1390
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:484
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "ለ \"%s\"ን ምርጫዎች"
 
-#: mail/folder-browser-ui.c:486
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "ምርጫዎች"
 
-#: mail/folder-browser.c:327 mail/mail-display.c:389 mail/mail-display.c:909
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -11549,129 +11484,129 @@ msgstr "%d ተልኳል"
 msgid "%d total"
 msgstr "%d አጠቃላይ"
 
-#: mail/folder-browser.c:1167
+#: mail/folder-browser.c:1182
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1714
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1715
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1716
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1722
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1724 mail/folder-browser.c:2048
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "አትም"
 
-#: mail/folder-browser.c:1748 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1750 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "ወደፊት፦"
 
-#: mail/folder-browser.c:1755
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1756
+#: mail/folder-browser.c:1771
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1772
 msgid "Cl_ear Flag"
 msgstr ""
 
 #. separator here?
-#: mail/folder-browser.c:1761 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1763
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1764
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1784
 msgid "U_ndelete"
 msgstr "አታጥፋ"
 
-#: mail/folder-browser.c:1773
+#: mail/folder-browser.c:1788
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1774 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1782
+#: mail/folder-browser.c:1797
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/folder-browser.c:1786
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1790
+#: mail/folder-browser.c:1805
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:2049
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:2051
+#: mail/folder-browser.c:2066
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:2052
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
@@ -11684,20 +11619,32 @@ msgstr "የነበረው"
 msgid "Getting Folder Information"
 msgstr ""
 
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr ""
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Factory to import mbox into Evolution"
+msgid "Evolution mbox importer"
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "Imports mbox files into Evolution"
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
 msgstr ""
 
 #: mail/local-config.glade.h:1
@@ -11740,55 +11687,55 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "እንግዳ ተቀባይ"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:126
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "የተጠቃሚ ስም"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "መተላለፊያ"
 
-#: mail/mail-account-gui.c:1851
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:223
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:297 mail/mail-accounts.c:335
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr "አበላሽ"
 
-#: mail/mail-accounts.c:297 mail/mail-accounts.c:337
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr "አስቻለ"
 
 #. translators: default account indicator
-#: mail/mail-accounts.c:377
+#: mail/mail-accounts.c:433
 msgid "[Default]"
 msgstr "የነበረው"
 
-#: mail/mail-accounts.c:422 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:811
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr "ያስችላል"
 
-#: mail/mail-accounts.c:427 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr ""
 
-#: mail/mail-accounts.c:429 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
@@ -11829,11 +11776,11 @@ msgid ""
 msgstr ""
 
 #. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:102 widgets/misc/e-messagebox.c:226
+#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/mail-callbacks.c:191
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11841,133 +11788,133 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:214
+#: mail/mail-callbacks.c:211
 msgid ""
 "You need to configure an account\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:257
+#: mail/mail-callbacks.c:254
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:269
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:317
+#: mail/mail-callbacks.c:313
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:321
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:326
+#: mail/mail-callbacks.c:322
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:460
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:716
+#: mail/mail-callbacks.c:722
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1692 mail/message-browser.c:143
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1694 mail/message-browser.c:145
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2338
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2354
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2390
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2400
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2420
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2461
+#: mail/mail-callbacks.c:2465
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2466
+#: mail/mail-callbacks.c:2470
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2507
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2509
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2677
+#: mail/mail-callbacks.c:2687
 msgid ""
 "This operation will permanently erase all messages marked as\n"
 "deleted. If you continue, you will not be able to recover these messages.\n"
@@ -11975,90 +11922,101 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2763
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2771
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "አጣራዎች"
 
-#: mail/mail-callbacks.c:2813
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/mail-callbacks.c:2869
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:2936
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3126
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:226
-msgid ""
-"Please specify signature filename\n"
-"in Advanced section of signature settings."
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+msgid "Unnamed"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:245 mail/mail-composer-prefs.c:247
-#: mail/mail-composer-prefs.c:376 mail/mail-composer-prefs.c:431
-msgid "[script]"
-msgstr "ጽሑፍ"
-
-#: mail/mail-composer-prefs.c:320
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:335 mail/mail-config.c:1393
-msgid "Unnamed"
-msgstr ""
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+msgid "[script]"
+msgstr "ጽሑፍ"
 
-#: mail/mail-composer-prefs.c:815
+#: mail/mail-composer-prefs.c:864
 msgid "Language(s)"
 msgstr "ቋንቋ"
 
-#: mail/mail-composer-prefs.c:859
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:878
+#: mail/mail-composer-prefs.c:926
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/mail-config-druid.c:147
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr ""
+
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:149
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+msgid "Receiving Mail"
+msgstr ""
+
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:151
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:153
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "ሴኔጋል"
+
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:155
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12067,16 +12025,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:645
-msgid "Evolution Account Assistant"
-msgstr ""
-
-#: mail/mail-config.c:1097
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1175 mail/mail-config.c:1179
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12104,10 +12057,6 @@ msgstr ""
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr ""
-
 #: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
 msgstr ""
@@ -12226,7 +12175,7 @@ msgstr ""
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "ጨርሷል"
 
@@ -12255,314 +12204,311 @@ msgid "Empty _trash folders on exit"
 msgstr ""
 
 #: mail/mail-config.glade.h:55
-msgid "Execute Command..."
+msgid "Evolution Account Assistant"
 msgstr ""
 
 #: mail/mail-config.glade.h:56
-msgid "Fi_xed -width:"
+msgid "Execute Command..."
 msgstr ""
 
 #: mail/mail-config.glade.h:57
-msgid "Font Properties"
+msgid "Fi_xed -width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:58
-msgid "Format messages in _HTML"
+msgid "Font Properties"
 msgstr ""
 
 #: mail/mail-config.glade.h:59
-msgid "Get Digital ID..."
+msgid "Format messages in _HTML"
 msgstr ""
 
 #: mail/mail-config.glade.h:60
-msgid "Highlight _quotations with"
+msgid "Get Digital ID..."
 msgstr ""
 
 #: mail/mail-config.glade.h:61
-msgid "IMAPv4 "
+msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
+#: mail/mail-config.glade.h:62
+msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "መልዕክቶች"
+
+#: mail/mail-config.glade.h:76
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "On Screen fonts"
-msgstr ""
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Or_ganization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "ቀለም ምረጡ"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "Receiving _Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "Restore Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "_ደህነት"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "ነባሮች"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "አስቻለ"
 
-#: mail/mail-config.glade.h:151
-msgid "_Fixed-width:"
-msgstr ""
-
 #: mail/mail-config.glade.h:152
 msgid "_Forward style:"
 msgstr ""
@@ -12640,22 +12586,30 @@ msgid "_Signatures"
 msgstr ""
 
 #: mail/mail-config.glade.h:174
-msgid "_Use secure connection (SSL):"
+msgid "_Standard Font:"
 msgstr ""
 
 #: mail/mail-config.glade.h:175
-msgid "_Variable-width:"
+msgid "_Terminal Font:"
 msgstr ""
 
 #: mail/mail-config.glade.h:176
-msgid "_every"
+msgid "_Use secure connection (SSL):"
 msgstr ""
 
 #: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+msgid "_every"
+msgstr ""
+
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "ቀለም"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "መግለጫ"
 
@@ -12679,81 +12633,77 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:192
+#: mail/mail-display.c:193
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-display.c:195
-msgid "Overwrite file?"
-msgstr ""
-
-#: mail/mail-display.c:331
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:404
+#: mail/mail-display.c:406
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr ""
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:454
 msgid "Save Attachment..."
 msgstr ""
 
-#: mail/mail-display.c:453
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:454
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:510
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:514
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "ደብቅ"
 
-#: mail/mail-display.c:534
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1335
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr ""
 
-#: mail/mail-display.c:1512
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1854
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1858
+#: mail/mail-display.c:1883
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr ""
 
-#: mail/mail-display.c:2211
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:2212
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "አያያዝ ቦታ ቅጂ"
 
-#: mail/mail-display.c:2214
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:2216
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "ምስሉን በሌላ ስም አስቀምጥ"
 
@@ -12762,13 +12712,13 @@ msgstr "ምስሉን በሌላ ስም አስቀምጥ"
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-format.c:639
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:681 mail/mail-format.c:1367 mail/mail-format.c:1436
-#: mail/mail-format.c:1556 mail/mail-format.c:1680 mail/mail-format.c:1705
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
@@ -12776,138 +12726,138 @@ msgstr ""
 msgid "Date"
 msgstr "ቀን"
 
-#: mail/mail-format.c:843
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:884 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr "ከ"
 
-#: mail/mail-format.c:888
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "ወደ"
 
-#: mail/mail-format.c:898
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:903
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1479
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1507
+#: mail/mail-format.c:1479
 msgid "Could not create a PGP verfication context"
 msgstr ""
 
-#: mail/mail-format.c:1515
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1522
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1786
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1800
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1827
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1833
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1835
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:536 mail/mail-local.c:538
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, c-format
 msgid "Local folders/%s"
 msgstr ""
 
-#: mail/mail-local.c:666
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:803
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:855
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1328
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1350
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1449
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
 
-#: mail/mail-local.c:1513
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-mt.c:256
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr ""
 
@@ -13008,83 +12958,79 @@ msgstr ""
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2213
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2213
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:120 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "ፈልግ"
-
-#: mail/mail-search.c:128
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr ""
 
-#: mail/mail-search.c:219
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr ""
 
-#: mail/mail-search.c:221
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr ""
 
-#: mail/mail-search.c:269
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr ""
 
-#: mail/mail-search.c:272
+#: mail/mail-search.c:285
 msgid "Search"
 msgstr "&ፈልግ"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:300
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:320
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "ፈልግ"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr ""
 
@@ -13123,24 +13069,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:254
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:256
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:280
 msgid "_Remember this password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ (_R)"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:281
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13149,57 +13095,57 @@ msgstr ""
 msgid "Could not save signature file: %s"
 msgstr ""
 
-#: mail/mail-signature-editor.c:175
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:229
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-signature-editor.c:182
+#: mail/mail-signature-editor.c:233
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:327
+#: mail/mail-signature-editor.c:389
 msgid "Edit signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:365
+#: mail/mail-signature-editor.c:429
 msgid "Enter a name for this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:368 my-evolution/e-summary-preferences.c:622
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "ስም"
 
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13208,11 +13154,11 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:776 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr ""
 
@@ -13225,15 +13171,15 @@ msgstr ""
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:945
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:219
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr ""
 
-#: mail/message-browser.c:221
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - መልዕክት"
@@ -13274,31 +13220,31 @@ msgstr ""
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1076
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "ዛሬ %l:%M %p"
 
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "ትናንት %l:%M %p"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1112
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1114
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2600
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr ""
 
@@ -13392,12 +13338,12 @@ msgstr ""
 msgid "_Flag:"
 msgstr "ባንዲራ"
 
-#: mail/subscribe-dialog.c:232
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:234
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
@@ -13412,28 +13358,24 @@ msgstr ""
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "ዶሴ"
 
-#: mail/subscribe-dialog.c:1427
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr ""
 
-#: mail/subscribe-dialog.c:1549
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1624
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "All folders"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:5 ui/evolution-comp-editor.xml.h:2
+#: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -13442,47 +13384,43 @@ msgstr ""
 msgid "Close"
 msgstr "ዝጋ"
 
-#: mail/subscribe-dialog.glade.h:6
-msgid "Display Options"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:7
-msgid "Folders whose names begin with:"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:4
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:9 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:6
 msgid "S_elect server: "
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:12
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr ""
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configuration control for the Evolution Summary."
+msgid "Configure the appearance of the Evolution Summary here"
 msgstr ""
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
-msgid "Configure the appearance of the Evolution Summary here"
+msgid "Evolution Summary"
 msgstr ""
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component."
+msgid "Evolution Summary component"
 msgstr ""
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+msgid "Evolution Summary configuration control"
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr ""
 
@@ -23275,32 +23213,32 @@ msgstr ""
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:377 my-evolution/e-summary-calendar.c:397
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:378
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+msgid "No appointments."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:414
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:416
-msgid "%l:%M %d %B"
+#: my-evolution/e-summary-calendar.c:407
+#, fuzzy
+msgid "%l:%M%P %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:434
+#: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr "መግለጫ የለም"
 
-#: my-evolution/e-summary-mail.c:156
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1118
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr ""
 
@@ -23312,19 +23250,19 @@ msgstr ""
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:612
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:618
+#: my-evolution/e-summary-preferences.c:621
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr ""
 
@@ -23341,11 +23279,11 @@ msgstr "ጨምር"
 msgid "Shown"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:371
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "መግለጫ የለም"
 
@@ -23353,11 +23291,11 @@ msgstr "መግለጫ የለም"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:269
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:490
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr ""
 
@@ -23365,23 +23303,23 @@ msgstr ""
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:592
+#: my-evolution/e-summary-weather.c:584
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary.c:199
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:512
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr ""
 
-#: my-evolution/e-summary.c:590 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr ""
 
-#: my-evolution/e-summary.c:624
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr ""
 
@@ -24652,19 +24590,19 @@ msgid "_Weather"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
+msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Configure special folders and offline folder behavior here"
+msgid "Evolution Shell"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
+msgid "Evolution folder settings configuration control"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
+msgid "Folder Settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:164
@@ -24682,7 +24620,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:127
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr ""
@@ -24695,8 +24633,8 @@ msgstr ""
 msgid "Drafts"
 msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:466
-#: shell/e-shell-view.c:470 shell/e-shortcuts.c:1083
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr ""
 
@@ -24708,11 +24646,11 @@ msgstr ""
 msgid "Sent"
 msgstr "ተልኳል"
 
-#: shell/e-setup.c:147
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:168
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24720,7 +24658,7 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -24730,36 +24668,12 @@ msgstr ""
 #: shell/e-setup.c:244
 #, c-format
 msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-
-#: shell/e-setup.c:262
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:268
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:291
-#, c-format
-msgid ""
 "The file `%s' is not a directory.\n"
 "Please move it in order to allow installation\n"
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:300
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -24791,108 +24705,108 @@ msgstr ""
 msgid "Autocompletion Folders"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:141
+#: shell/e-shell-folder-commands.c:140
 #, c-format
 msgid "Cannot copy folder: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, c-format
 msgid "Cannot move folder: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:189
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:191
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:205
+#: shell/e-shell-folder-commands.c:204
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:320
+#: shell/e-shell-folder-commands.c:319
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:324
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:364
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "ዶሴን አስወግድ"
 
-#: shell/e-shell-folder-commands.c:392
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:406
+#: shell/e-shell-folder-commands.c:405
 #, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:413
+#: shell/e-shell-folder-commands.c:412
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\"ን አጥፉ"
 
-#: shell/e-shell-folder-commands.c:486
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "ዶሴን እንደገና ሰይም"
 
-#: shell/e-shell-folder-commands.c:550
-#: shell/e-shell-folder-creation-dialog.c:169
+#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-creation-dialog.c:170
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:583
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:586
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:126
+#: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:308
 msgid "Create New Folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: shell/e-shell-folder-title-bar.c:649 shell/e-shell-folder-title-bar.c:650
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(ያልተሰየመ)"
 
@@ -24909,7 +24823,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:815
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -24920,7 +24834,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:351
 msgid "Select importer"
 msgstr ""
 
@@ -24930,7 +24844,7 @@ msgid "File %s does not exist"
 msgstr ""
 
 #: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
-#: shell/e-shell-importer.c:557
+#: shell/e-shell-importer.c:552
 msgid "Evolution Error"
 msgstr ""
 
@@ -24957,70 +24871,70 @@ msgstr ""
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:556
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:573
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "አውቶማቲክ"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "የፋይል ስም፦"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "ፋይል ምረጡ"
 
-#: shell/e-shell-importer.c:690
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "የፋይሉ ዓይነት፦"
 
-#: shell/e-shell-importer.c:715
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:719
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:644
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:788
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:770
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "ከ %s፦"
 
-#: shell/e-shell-importer.c:1082
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "ዶሴ ምረጡ"
 
-#: shell/e-shell-importer.c:1083
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:191
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "ከውጭ አስገባ"
 
-#: shell/e-shell-offline-handler.c:588
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr ""
 
@@ -25041,47 +24955,43 @@ msgstr ""
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:340
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+msgid "Please select a user."
+msgstr ""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 msgid "Opening Folder"
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:346
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:351
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, c-format
 msgid "in \"%s\" ..."
 msgstr "በ\"%s\" ውስጥ ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:431
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, c-format
 msgid "Could not open shared folder: %s."
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:484
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:158
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr ""
-
 #: shell/e-shell-user-creatable-items-handler.c:582
 #: shell/e-shell-user-creatable-items-handler.c:636
-#: widgets/misc/e-charset-picker.c:105
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr "አዲስ"
 
@@ -25094,10 +25004,14 @@ msgid "Folder name cannot contain the Return character."
 msgstr ""
 
 #: shell/e-shell-utils.c:129
-msgid "Folder name cannot contain slashes."
+msgid "Folder name cannot contain the character \"/\"."
 msgstr ""
 
 #: shell/e-shell-utils.c:135
+msgid "Folder name cannot contain the character \"#\"."
+msgstr ""
+
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
@@ -25138,46 +25052,46 @@ msgstr ""
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:776
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:802 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:233
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1997
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1999
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(ምንም)"
 
-#: shell/e-shell-view.c:2042
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2049
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2055
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:176
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25185,12 +25099,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:756
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1829
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25198,19 +25112,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2094
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2096
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2098
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2100 shell/e-storage.c:576
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "አጠቃላይ ስህተት"
 
@@ -25327,11 +25241,11 @@ msgstr "አስወግድ"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:648
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1095
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "አቋራጮች"
 
@@ -25339,59 +25253,59 @@ msgstr "አቋራጮች"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:574
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "ስህተት የለም"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "I/O ስህተት"
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:588
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:590
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:594
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:596
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:598
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:600
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:602
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr ""
 
-#: shell/e-storage.c:604
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -25405,11 +25319,11 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-folder-selector-button.c:101
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:123
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -25420,7 +25334,7 @@ msgstr ""
 "\n"
 "ያልታወቀ ስህተት።"
 
-#: shell/evolution-shell-component-utils.c:126
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -25429,7 +25343,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:133
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -25438,63 +25352,63 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1165
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "የCORBA ብልሽት"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1171
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "ባለቤት የለም"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "አልተገኘም"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1179
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1181
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1183
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "የውስጥ ብልሽት"
 
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "የማይሰራ URI"
 
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr ""
 
@@ -25507,18 +25421,10 @@ msgid "Evolution Test Component"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr ""
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "እንግዳ ተቀባይ"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr ""
 
@@ -25566,37 +25472,37 @@ msgstr "የዶሴ ስም፦ (_F)"
 msgid "_User:"
 msgstr "ተጠቃሚ፦ (_U)"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 
 #: shell/importer/import.glade.h:1
@@ -25646,25 +25552,26 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:104 shell/main.c:474
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:110
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:209
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:266
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -25674,46 +25581,50 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:230
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:238
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:357
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:366
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:446
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:448
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:450
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:452
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr ""
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:454
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:478
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -25721,7 +25632,6 @@ msgid ""
 msgstr ""
 
 #: tools/evolution-addressbook-abuse.c:81
-#: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
@@ -25731,14 +25641,47 @@ msgstr ""
 msgid "Input File"
 msgstr ""
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr ""
-
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr ""
 
+#: tools/evolution-launch-composer.c:324
+msgid "An attachment to add."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:327
+msgid "Description of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:329
+msgid "Default subject for the message."
+msgstr ""
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr ""
@@ -25827,7 +25770,7 @@ msgstr ""
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr "ትግባሮች (_A)"
 
@@ -25945,7 +25888,7 @@ msgid "Print this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:152
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "አስቀምጥ"
 
@@ -25972,7 +25915,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "ፋይል (_F)"
 
@@ -26218,7 +26161,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "ዶሴ (_F)"
 
@@ -26622,7 +26565,7 @@ msgstr ""
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "መሣሪያዎች (_T)"
 
@@ -26637,12 +26580,12 @@ msgstr "ይሄንን መስኮት ዝጋ"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Close"
 msgstr "ዝጋ (_C)"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "ተመልከት (_V)"
 
@@ -26821,7 +26764,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr "መረጃ (_H)"
 
@@ -26998,122 +26941,114 @@ msgid "Pi_lot Settings..."
 msgstr ""
 
 #: ui/evolution.xml.h:27
-msgid "Pilot Con_duit Settings..."
-msgstr ""
-
-#: ui/evolution.xml.h:28
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "ላክ / ተቀበል"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:31
-msgid "Set up Pilot conduit configuration"
-msgstr ""
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Set up Pilot configuration"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "የስሕተቱን ጉዳይ አቅርብ"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "የስሕተቱን ጉዳይ አቅርብ"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "ቀያያር"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "ቅጂ... (_C)"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Folder..."
 msgstr "ዶሴ... (_F)"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "ወደ ዶሴን ሂዱ... (_G)"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "ከውጭ አስገባ... (_I)"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "መንቀሳቅስ... (_M)"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "አዲስ (_N)"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "_አዲስ ዶሴ (_N)"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 msgid "_Remove Other User's Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "እንደገና ሰይም... (_R)"
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "ላክ / ተቀበል (_S)"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr "አቋራጭ... (_S)"
 
@@ -27189,9 +27124,8 @@ msgstr "በምድብ ጋር (_C)"
 msgid "_Tasks"
 msgstr ""
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:201
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:688
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr "UTC"
 
@@ -27233,24 +27167,24 @@ msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:431
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "ሳማረሐዓቅእ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1104
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "አሁኑኑ"
 
-#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr "ዛሬ"
 
-#: widgets/misc/e-cell-date-edit.c:802
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -27259,80 +27193,80 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "ባቲክ"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "ካከለኛ አውሮፓውያን"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "ቻይንኛ"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "ቄርሎሳዊ ጽሑፍ"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "ግሪክኛ"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr "ዕብራስጥ"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "ጃፓንኛ"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "ኮሪያኛ"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "ቱርክኛ"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "ዩኒኮድ"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "ምዕራብ አውሮፓዊ"
 
-#: widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "ባሕላዊው"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr "ቀላል"
 
-#: widgets/misc/e-charset-picker.c:93
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "ዩክረኒኛ"
 
-#: widgets/misc/e-charset-picker.c:96
+#: widgets/misc/e-charset-picker.c:97
 msgid "Visual"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:165
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:207
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:282
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "ሌላ..."
 
-#: widgets/misc/e-charset-picker.c:402
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr ""
 
@@ -27340,11 +27274,12 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:187
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:209
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr ""
 
@@ -27376,44 +27311,78 @@ msgstr "ጥያቄ"
 msgid "Message"
 msgstr "መልዕክት"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "ፈልግ"
+
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 msgid "_Clear"
 msgstr "ሰርዝ"
 
-#: widgets/misc/e-search-bar.c:823
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:830
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:847
 msgid "Text"
 msgstr "ጽሑፍ"
 
-#: widgets/misc/e-search-bar.c:915
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "ሰርዝ"
 
-#: widgets/misc/e-search-bar.c:917
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr ""
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "The Personal Addressbook Server"
+msgid "Evolution Addressbook local/LDAP backend"
 msgstr ""
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
 #: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
+msgid "Evolution Calendar local file backend"
+msgstr ""
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+msgid "Evolution Addressbook local file backend"
 msgstr ""
 
+#~ msgid "<- _Remove"
+#~ msgstr "አስወግድ"
+
+#~ msgid "_Add ->"
+#~ msgstr "ጨምር"
+
+#~ msgid "_Always"
+#~ msgstr "ሁል ጊዜ (_A)"
+
+#~ msgid "_More Options >>"
+#~ msgstr "_ተጨማሪ ምርጫዎች >>"
+
+#~ msgid "minute"
+#~ msgstr "ደቂቃ"
+
+#~ msgid "hour"
+#~ msgstr "ሰዓት"
+
+#~ msgid "week"
+#~ msgstr "ሳመንት"
+
+#~ msgid "year"
+#~ msgstr "ዓመት"
+
+#~ msgid "Host"
+#~ msgstr "እንግዳ ተቀባይ"
+
 #~ msgid "Attribute"
 #~ msgstr "ጠባየ-አንቀጽ"
 
diff --git a/po/az.po b/po/az.po
index c61666b3bb..252e2585ad 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.99.2\n"
-"POT-Creation-Date: 2002-10-28 16:49-0500\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2001-12-19 19:21GMT+0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
@@ -14,40 +14,52 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "LDIF fayllarını Evolution içinə gətirən emalatxana."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution İdxalçı Yardımçısı"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "LDIF fayllarını Evolution içinə gətirir."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolutionun ePoçt yazıçısı."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "VCard fayllarını Evolution içinə gətirən emalatxana."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolutionun ePoçt yazıçısı."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "VCard fayllarını Evolution içinə gətirir."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Fərqli Qeyd Et"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ad"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "ePoçt"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "İlk"
 
@@ -57,16 +69,17 @@ msgstr "İlk"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Köməkçi"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Məslək"
 
@@ -76,12 +89,12 @@ msgid "Bus"
 msgstr "Məs"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Geri axtarma"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Şirkət"
 
@@ -92,12 +105,13 @@ msgstr "Şir"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Ev"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Quruluş"
@@ -108,18 +122,18 @@ msgstr "Qur"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Əl Telefonu"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "Maşın"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "İş Faksı"
@@ -129,13 +143,13 @@ msgid "Bus Fax"
 msgstr "İş Faksı"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Ev Faksı"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "2-ci İş"
 
@@ -144,43 +158,43 @@ msgid "Bus 2"
 msgstr "İş 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "2-ci Ev"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Başqa"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Başqa faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Peycer"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Teleks"
@@ -191,15 +205,15 @@ msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "2-ci ePoçt ünvanı"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "3.ncü ePoçt ünvanı"
@@ -223,6 +237,7 @@ msgid "Dep"
 msgstr "Böl"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "İdarə"
@@ -232,6 +247,7 @@ msgid "Off"
 msgstr "Qapalı"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Başlıq"
@@ -246,6 +262,7 @@ msgid "Prof"
 msgstr "Məs"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "İdarəci"
@@ -259,6 +276,7 @@ msgid "Ass"
 msgstr "Yar"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Ləqəb"
@@ -268,16 +286,19 @@ msgid "Nick"
 msgstr "ULəqəb"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1418
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Yoldaş"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1459
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Qeyd"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "Təqvim URI"
 
@@ -295,247 +316,350 @@ msgid "FBUrl"
 msgstr "SMUrl"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Default server calendar"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "Təqvim"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "İldönümü"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "İldö"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Ad Günü"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kateqoriyalar"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Soyad"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "Maşın"
+
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-card-simple.c:893
 #: addressbook/backend/ebook/e-destination.c:706
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Adsız Əlaqələr Siyahısı"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "Çoxlu VCard"
+#: addressbook/backend/ebook/e-card.c:1308
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Tam Ad"
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "%s üçün VCard"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Ünvan :"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "Ünvan Kartları"
+
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "Yoxdur"
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "Ad Günü"
+
+#: addressbook/backend/ebook/e-card.c:1355
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1369
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Quruluş"
+
+#: addressbook/backend/ebook/e-card.c:1390
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rolu"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-#: addressbook/backend/ebook/load-pine-addressbook.c:22
-#: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
-#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+#, fuzzy
+msgid "Mailer"
+msgstr ""
+"\n"
+"Göndərici:  "
+
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "Sə_rbəst/Məşğul URL:"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Təqvim"
+
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Əlaqəni Silimmi?"
+
+#: addressbook/backend/ebook/e-card.c:1480
+#, fuzzy
+msgid "Category List"
+msgstr "Kateqoriya"
+
+#: addressbook/backend/ebook/e-card.c:1487
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1494
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1501
+#, fuzzy
+msgid "List"
+msgstr "siyahı"
+
+#: addressbook/backend/ebook/e-card.c:1508
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "BaşqaÜnvanlar"
+
+#: addressbook/backend/ebook/e-card.c:1515
+#, fuzzy
+msgid "Arbitrary"
+msgstr "İlk"
+
+#: addressbook/backend/ebook/e-card.c:1522
+#, fuzzy
+msgid "ID"
+msgstr "I"
+
+#: addressbook/backend/ebook/e-card.c:1529
+#, fuzzy
+msgid "Last Use"
+msgstr "Yapışdır"
+
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "Xal"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "Bonoboyu başlada bilmədim"
 
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:2978
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Axtarılır..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Yüklənir ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "Siyahı _adı:"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "_Bu ePoçt ünvanıdır"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP vericiyə bağlantı qurulur..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "LDAP vericiyə kart əlavə edilir..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "LDAP vericidən kart çıxardılır..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1572
-#: addressbook/backend/pas/pas-backend-ldap.c:1575
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP vericidəki kart təkmilləşdirilir..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "LDAP axtarış nəticələri alınır..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 #, fuzzy
 msgid "Error performing search"
 msgstr "Kart çıxartma xətası"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 #, fuzzy
 msgid "Default Sync Address:"
 msgstr "ePoçt Ünvanı: "
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Ox yüklənə bilmədi\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "eKitab yüklənmədi\n"
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Wombat xidməti başladıla bilmədi"
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Wombatı başlada bilmədim"
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot Ünvan əlavələri bloku oxuna bilmədi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Bonobonun ünvan nümayiş etdirmə vasitəsi."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Bonobonun ünvan nümayiş etdirmə  vasitəsi."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Ünvan dəftəri göstərən nümunəvi Bonobo idarəsi."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Configure access to LDAP directory servers here"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution ünvan dəftəri kiçik kartlarını göstərən idarə."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Ünvan dəftərini düzəlt"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Əlaqələri idarə edici Evolution əlavəsi."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Evolutionun Ünvan Dəftəri Kiçik Kart emalatxanası"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Ünvan Dəftərində ünvan göstərici emalatxanası"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Ünvan Dəftəriidə ünvan göstərici"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
-msgstr "Ünvan Dəftərində ünvan göstərici emalatxanası"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr "Nümunəvi ünvan dəftəri idarəsi emalatxanası"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
 
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:611
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1067
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
 msgstr "Əlaqələr"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "Əlaqələr məlumatını daxil edən qovluq."
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "LDAP Vericisi"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "Əlaqələr məlumatını daxil edən LDAP verici."
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public Contacts"
 msgstr "Əlaqələr"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public folder containing contact information"
 msgstr "Əlaqələr məlumatını daxil edən qovluq."
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Yeni Əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Yeni bir hesab yarat"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Yeni Əlaqə Siyahısı"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Əlaqə Siyahısı"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Yeni bir əlaqə siyahısı yarat"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "LDAP vericiyə bağlanma xətası."
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -543,58 +667,49 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:648
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1193
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Süzgəc məlumatını yükləmə xətası:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
 
-#: addressbook/gui/component/addressbook-config.c:1630
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Hesab Adı"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Verici Adı"
 
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
-msgid "Could not initialize gnome-vfs"
-msgstr "gnome-vfs-ni başlada bilmədim"
+#: addressbook/gui/component/addressbook-config.c:1676
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Digər Əlaqələr"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "Ünvan dəftərini aça bilmədim"
-
-#: addressbook/gui/component/addressbook.c:480
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -602,7 +717,7 @@ msgstr ""
 "Bu ünvnan dəftərini aça bilmədik.  Xahiş edirik,\n"
 "cığırın mövcudiyyətini və üstündəki səlahiyyətlərinizi yoxlayın."
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:522
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -612,7 +727,7 @@ msgstr ""
 "Bu ünvan dəftərini aça bilmirik. Ya səhv URL bildirdiniz,\n"
 "ya da LDAP verici işləmir."
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -624,7 +739,7 @@ msgstr ""
 "üçün aşağıdakı körpüdən alacağınız OpenLDAP yardımıyla\n"
 "endirib CVS üstündə proqramın mənbə kodunu yenidən dərləməlisiniz.\n"
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:537
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -634,12 +749,15 @@ msgstr ""
 "Bu ünvan dəftərini aça bilmirik. Ya səhv URL bildirdiniz,\n"
 "ya da LDAP verici işləmir."
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:582
+#: addressbook/gui/component/addressbook.c:557
+msgid "Unable to open addressbook"
+msgstr "Ünvan dəftərini aça bilmədim"
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -647,38 +765,38 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:633
-#: addressbook/gui/component/addressbook.c:636
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s üçün parol girin (istifadəçi %s)"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 #, fuzzy
 msgid "Name begins with"
 msgstr "sonlanır"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 #, fuzzy
 msgid "Email begins with"
 msgstr "sonlanır"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kateqoriya"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Daxil edən hər hansı üzv"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Ətraflı..."
 
-#: addressbook/gui/component/addressbook.c:956
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -686,7 +804,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:962
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -694,25 +812,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:968
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:975
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1050
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr "Hər Hansı Kateqoriya"
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "Qovluq Səyyahını göstərəcək olan URI"
 
@@ -721,139 +839,126 @@ msgstr "Qovluq Səyyahını göstərəcək olan URI"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr "(heç biri)"
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/component/e-address-popup.c:478
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "İlk ePoçt ünvanı"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Gediş Seç"
 
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Yeni \"%s\" əlaqəsi yarat"
 
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Mövcud \"%s\" əlaqəsinə ünvan əlavə et"
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Ünvan Dəftəri Sorğulanır..."
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Əlaqə Məlumatını Düzəlt"
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Əlaqələrə Əlavə Et"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "ePoçt Ünvanını Birləşdir"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Sorğuları Bağla"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Sorğuları Fəallaşdır (Təhlükəlidir!)"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr " Dəstəklənən növləri _yoxla "
 
-#: addressbook/gui/component/ldap-config.glade.h:2
-msgid "1234"
+#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:5
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-#, fuzzy
-msgid "380"
-msgstr "389"
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "636"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "666"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "<- _Remove"
-msgstr " _Sil"
+msgid "Add LDAP Server"
+msgstr "LDAP Vericisi"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Seçənəklər"
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "Ünvan Dəftəri Qaynağı"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always"
 msgstr "Alarm"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Anonymously"
 msgstr "Adsız"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -862,79 +967,61 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Connecting"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
-msgid "DN Customization"
-msgstr "Məlumat Yoxdur"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "Si_l"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "Siyahı _adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "LDAP Vericisi"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "ePoçt Ünvanı: "
 
-#: addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
-msgid "Evolution Attribute"
-msgstr "Evolution Alarmı"
-
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution bu Poçt ünvanından vericiyə tanıtmaq üçün istifadə edəcək"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution bu Poçt ünvanından vericiyə tanıtmaq üçün istifadə edəcək"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Finished"
 msgstr "A_xtar"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "Ümumi"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "LDAP Configuration Assistant"
 msgstr "Quraşdırma"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Mappings"
-msgstr "Kənarlar"
-
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_hər"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -944,72 +1031,35 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:42
-msgid "Objectclasses Used in Evolution:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses Used on Server:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Bir"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "R_estore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Re_store Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Axtarışın əhatə _sahəsi:"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
-#: calendar/gui/e-week-view.c:1240
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 msgid "Searching"
 msgstr "Axtarılır"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
-msgid "Select"
-msgstr "Hamısını Seç"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Silinən"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -1020,7 +1070,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1029,54 +1079,47 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Mənbə Məlumatı"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Vericiyə bağlantı qurulur..."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Baz."
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Dəstəklənməyən sxem"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1084,7 +1127,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1093,7 +1136,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1101,17 +1144,17 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
 "directory tree. A search scope of \"sub\" will include all entries below "
 "your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1121,27 +1164,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1149,7 +1192,7 @@ msgid ""
 "It is for display purposes only. "
 msgstr "Bu ad hesab adınızı müəyyəmləşdirər. Ancaq nümayiş məqsədi daşıyır."
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1157,88 +1200,46 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "Using email address"
 msgstr "_Bu ePoçt ünvanıdır"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:108
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Əlavə Et"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-#, fuzzy
-msgid "_Add ->"
-msgstr "_Əlavə Et"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-#, fuzzy
-msgid "_Add Mapping"
-msgstr "Gediş əlavə et"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-#, fuzzy
-msgid "_Add to DN"
-msgstr "Gediş əlavə et"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-#, fuzzy
-msgid "_Always"
-msgstr "Alarm"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "Hamısını _Sil"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Ekran"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Distinguished Name (DN):"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_Don't use SSL/TLS"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1248,211 +1249,153 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Düzəlt"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "Görüşü _düzəlt"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-#, fuzzy
-msgid "_Evolution attribute:"
-msgstr "Evolution Alarmı"
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_If necessary "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "_LDAP attributes:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-#, fuzzy
-msgid "_More Options >>"
-msgstr "_Seçənəklər"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Qapı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
-msgid "_Restore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Search base:"
 msgstr "Axtarış ə_sası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "_Verici adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Xəbərdarlıq vaxtı ( dəqiqə )"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
-#, fuzzy
-msgid "account-druid"
-msgstr "Hesab %d"
-
-#: addressbook/gui/component/ldap-config.glade.h:132
-#, fuzzy
-msgid "account-editor"
-msgstr "əlaqə-siyahısı-editoru"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "cards"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "connecting-tab"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:136
-msgid "edit_server_window_simple"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:97
 #, fuzzy
 msgid "general-tab"
 msgstr "Ümumi"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:139
-msgid "objectclasses-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "searching-tab"
 msgstr "Axtarılır"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
 msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü emalatxanası"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Hamısını Sil"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:699
-#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
-#: shell/e-shortcuts-view.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Sil"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr "Hamısını Sil"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Yeni Əlaqə Siyahısı"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "Əlaqə Məlumatını Düzəlt"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
 msgid "Send HTML Mail?"
 msgstr "HTML məktubu göndərək?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
-msgstr "Əlaqə Siyahısını Düzəlt"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
-msgid "Unnamed Contact List"
-msgstr "Adsız Əlaqələr Siyahısı"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d göstərilmir)"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr "Adsız Əlaqə"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+msgid "Source"
+msgstr "Qaynaq"
+
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Ünvan Dəftərindən Əlaqələri Seçin"
 
-#: addressbook/gui/component/select-names/e-select-names.c:564
+#: addressbook/gui/component/select-names/e-select-names.c:648
 #, fuzzy
 msgid "Find contact in"
 msgstr "Daxil edən yollayıcılar"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Find"
+msgstr "Axtar:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Ad Seç"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 #, fuzzy
 msgid "Selected Contacts:"
 msgstr "Əlaqəni Silimmi?"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 #, fuzzy
 msgid "Show Contacts"
 msgstr "Əlaqələr"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid ""
 "Type a name into the entry, or\n"
 "select one from the list below:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
 msgstr "_Kateqoriya:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "_Qovluq:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "A_ssistant's name:"
 msgstr "_Köməkçi adı :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 #, fuzzy
 msgid "Add_ress..."
 msgstr "_Ünvan..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "_İl dönümü :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
 msgid "Birthda_y:"
 msgstr "_Ad günü :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#, fuzzy
-msgid "C_ontacts..."
-msgstr "_Əlaqələr ..."
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Nö_vlər..."
@@ -1463,7 +1406,7 @@ msgstr "Iş birliği"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Əlaqə düzəldicisi"
 
@@ -1473,7 +1416,7 @@ msgid "D_epartment:"
 msgstr "_Bölmə :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "Ətraflı"
 
@@ -1517,1145 +1460,1192 @@ msgstr "_Orqanizasiya:"
 msgid "P_rofession:"
 msgstr "_Məslək :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Telefon Növləri"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "S_pouse:"
 msgstr "_Yoldaş:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "This is the _mailing address"
 msgstr "_Bu ePoçt ünvanıdır"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Wants to receive _HTML mail"
 msgstr "_HTML ePoçtlarını qəbul edir"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
-#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
-#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "_Sil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "Məslək _izahı:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "_İdarəcinin Adı :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "_Ləqəb :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_İdarə :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "_Ümumi Təqvim URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "_Veb səhifəsi ünvanı:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:183
+#, fuzzy
+msgid "Editable"
+msgstr "Fəallaşdır"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "Birləşmiş Ştatlar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr "Əfqanıstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albaniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Əlcəzair"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr "Amerikan Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr "Anqola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr "Anquilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr "Antiq Və Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr "Ermənistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Avstraliya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Avstriya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "Azərbaycan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahreyn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr "Banqladeş"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr "Belarusiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belçika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "Beliz"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr "Butan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Boliviya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr "Bosniya Və Herzegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr "Botsvana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr "Buvet Adası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Braziliya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
 msgstr "Britaniya Hind Okeanı Sahəsi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr "Bruney Darüssəlim"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bolqariya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr "Kambodiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr "Keyp Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Kayman Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
 msgstr "Mərkəzi Afrika Respublikası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "Çad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Çili"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "Çin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Kristmas Adası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokos Adası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Kolumbiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr "Komor"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Konqo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr "Kuku Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr "Kot Divuar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Xırvatıstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Kuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Kipr (Yunan və Türk) "
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Çex Respublikası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Danimarka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr "Cibuti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr "Dominik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Dominikan Respublikası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "Şərqi Timor"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Ekvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Misir"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "Elsalvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Ekvatorial Qvineya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritre"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estoniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Efiopiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Folkland Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Faro Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fici"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finlandiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Fransa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Fransız Gvineyası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Fransız Poloneziyası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Cənubi Fransız Sahələri"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Qabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Qambiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Gürcüstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Almanya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Qana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Yunanıstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Qrinland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Qrenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Quadelup"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Quam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Quatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr "Qvineya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr "Qvineya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "Quyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr "Herd Və McDonald Adları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "Müqəddəs Dəniz"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "Honq Konq"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Macarıstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "İslandiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "Hindistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "İndoneziya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "İrlandiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "İsrail"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "İtaliya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Yamayka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Yaponiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "İordaniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Qazaxıstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #, fuzzy
 msgid "Korea, Republic Of"
 msgstr "Koreya Respublikası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Küveyt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr "Qırğızıstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr "Latviya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Livan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "Lixtenşteyn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litvaniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Lüksemburq"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Macau"
 msgstr "Makau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr "Makedoniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr "Madaqaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr "Malavi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr "Malayziya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr "Maldiv"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr "Marşal Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr "Martiniq"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr "Mavritaniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr "Maurit"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr "Mayot"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr "Meksika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr "Mikroneziya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Moldova, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
 msgstr "Monako"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr "Monqolustan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr "Mərakeş"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr "Mozambiq"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr "Namibiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr "Hollandiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "Holland Antilləri"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "Yeni Kaledoniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr "Yeni Zellandiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr "Nikaraqua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr "Nigeriya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr "Niu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr "Norfolk Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr "Şimali Marian Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr "Norveç"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr "Fələstin Bölgəsi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr "Papua Yeni Qvineya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr "Paraqvay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr "Filippin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr "Pitkairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr "Polşa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr "Portuqaliya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr "Porto Riko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr "Katar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr "Reyunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr "Ruminıya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr "Rusiya Federasiyası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr "Rvanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr "Müqəddəs Kits Və Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr "Müqəddəs Lusiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Müqəddəs Vinsent Və Grenadinlər"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome Və Prinsip"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr "Səudiyyə Ərəbistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr "Seneqal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr "Seyşel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr "Siera Lione"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr "Sinqapur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr "Slovakiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr "Sloveniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr "Solomon Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr "Somali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr "Cənubi Afrika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Cənub Georgiya Və Cənub Sandviç Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr "İspaniya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr "Şri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr "Müqəddəs Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr "Müqəddəs Pyer Və Mikuelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard Və Xuan Mayen Adları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr "Svaziland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr "İsveç"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr "İsveçrə"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr "Tayvan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr "Tacikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 #, fuzzy
 msgid "Tanzania, United Republic Of"
 msgstr "Birləşmiş Tanzaniya Respublikası"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "Tayland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr "Toqo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr "Tokelo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tonga"
 msgstr "Tonqa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr "Trinidad Və Tobaqo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "Tunis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr "Türkiyə"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr "Türkmənistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr "Türk Və Kaykos Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr "Uqanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr "Ukrayna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
 msgstr "Birləşmiş Ərəb Əmirlikləri"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr "Birləşmiş Krallıq"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr "Birləşmiş Ştatlar yanı Kiçik Adalar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr "Uruqvay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr "Özbəkistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr "Vyetnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #, fuzzy
 msgid "Virgin Islands, British"
 msgstr "A.B.Ş. Virgin adları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 #, fuzzy
 msgid "Virgin Islands, U.S."
 msgstr "A.B.Ş. Virgin adları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr "Vallis Və Futuna Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr "Qərbi Saxara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr "Yəmən"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr "Yuqoslaviya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr "Zambiya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:459
 #, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
+msgid "Book"
+msgstr "İçindəkilər"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "Əlaqəni Silimmi?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
+#, fuzzy
+msgid "Card"
+msgstr "Maşın"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+#, fuzzy
+msgid "Is New Card"
+msgstr "Yeni"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#, fuzzy
+msgid "Writable Fields"
+msgstr "_Göndərən Girişi"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "Çad"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Kateqoriya editoru mövcud deyildir."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:833
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "Bu üzv bu kateqoriyalara aitdir:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "VCard olaraq qeyd et"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2440
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Sahənin pəncərəciyi tapıla bilmir: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Cəld Əlaqə Əlavəsi"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Hamısını Düzəlt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Tam Ad"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "ePoçt"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "Fayl qeyd edərkən xəta oldu: %s"
+
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "siyahı"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:221
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2664,151 +2654,148 @@ msgstr ""
 "%s onsuz da mövcuddur.\n"
 "Üstünə yazmaq istəyirsiniz?"
 
-#: addressbook/gui/contact-editor/file-exists.glade.h:1
-msgid "Confirm Overwrite"
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:2
-msgid "Don't bother translating this string.  It's not used."
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 #, fuzzy
 msgid "Overwrite"
 msgstr "Faylının üsütünə yazım mı?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Ünvan _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Ünvanı Yoxla"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Öl_kə:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Ünvan :"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "_Şəhər:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Poçt Qutusu:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Vilayət"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_ZIP Kodu:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "Tam adı yoxla"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Miss"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Mr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Mrs."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Ms."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Ad :"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Soyad :"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Orta ad:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "B_aşlıq:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "List _name:"
 msgstr "Siyahı _adı:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Members"
 msgstr "Üzvlər"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 "Poçt ünvanını yazın ya da əlaqə məlumatını aşağıdakı siyahıya sürükləyin:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "Bu siyahıya məktub göndərəndə ünvanları _gizlə"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Çıxart"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "contact-list-editor"
 msgstr "əlaqə-siyahısı-editoru"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "Yeni Siyahı"
+
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 msgid "Contact List Editor"
 msgstr "Əlaqə Siyahısı Editoru"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "VCard olaraq qeyd et"
@@ -2863,276 +2850,297 @@ msgstr ""
 "Dəyişdirilmiş bu əlaqənin ad və ya poçt ünvanı qovluqda onsuz da\n"
 "mövcuddur. Bunu yenə də əlavə etmək istəyirsiniz?."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:153
+#. FIXME: get the toplevel window...
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Ətraflı Axtarış"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Axtar"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:408
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:466
+#, fuzzy
+msgid "Query"
+msgstr "Almanya"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 #, fuzzy
 msgid "Error getting book view"
 msgstr "%s başladırkən xəta oldu"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#, fuzzy
+msgid "Model"
+msgstr "Əl Telefonu"
+
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
-#: addressbook/gui/widgets/e-addressbook-util.c:91
-#: addressbook/gui/widgets/e-minicard.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Kard təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1141
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Müvəffəqiyyət"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr "Naməlum xəta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Nüsxə xətdən deyil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1171
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "Qadağandır"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Kart tapıla bilmədi"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Kard ID onsuz da mövcuddur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokol dəstəklənmir"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
-#: camel/camel-service.c:739 camel/camel-service.c:779
-#: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:779
+#: camel/camel-service.c:849 camel/camel-service.c:892
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr "Ləğv Edildi"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Tanıtma bacarılmadı."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Tanıtma lazımdır"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "`%s' faylı yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Başqa xəta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:63
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Dəyişiklikləri qeyd etmək istəyirsinizimi?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#, fuzzy
+msgid "_Discard"
+msgstr "Kartı çap et"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Siyahıya əlavə etmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
-#: addressbook/gui/widgets/e-addressbook-util.c:292
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Kart əlavə etmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Siyahı təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Siyahı çıxartma xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
-#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1588
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Kart çıxartma xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-#, fuzzy
-msgid "Display Cards?"
-msgstr "Ekran"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-#, fuzzy
-msgid "Display Cards"
-msgstr "Ekran"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:213
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 #, fuzzy
 msgid "Move card to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 #, fuzzy
 msgid "Copy card to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 #, fuzzy
 msgid "Move cards to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Çoxlu VCard"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "%s üçün VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Növ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Ünvan Dəftəri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
-#: addressbook/gui/widgets/e-addressbook-view.c:813
-#: addressbook/gui/widgets/e-addressbook-view.c:1790
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olaraq qeyd et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "New Contact..."
 msgstr "Yeni Əlaqə"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Yeni Əlaqə Siyahısı"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Qovluğa _Get ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 #, fuzzy
 msgid "Import..."
 msgstr "_İdxal Et..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "Əlaqələri A_xtar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Ünvan Dəftəri Qaynağı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot Qurğuları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:814
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Əlaqəni Çatdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Əlaqəyə İsmarış Göndər"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:816
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Zərfi Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:826
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kəs"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:827
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Köçürt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:828
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Yapışdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Sil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 #, fuzzy
 msgid "Current View"
 msgstr "_Hazırkı Görünüş"
@@ -3141,7 +3149,7 @@ msgstr "_Hazırkı Görünüş"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,ç,d,e,ə,f,g,ğ,h,i,j,k,,l,m,n,o,ö,p,q,r,s,ş,t,u,ü,v,w,x,y,z"
 
@@ -3149,11 +3157,11 @@ msgstr ",123,a,b,c,ç,d,e,ə,f,g,ğ,h,i,j,k,,l,m,n,o,ö,p,q,r,s,ş,t,u,ü,v,w,x,
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,ç,d,e,ə,f,g,ğ,h,i,j,k,,l,m,n,o,ö,p,q,r,s,ş,t,u,ü,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1290
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3221,20 +3229,61 @@ msgstr "Digər Telefonlar"
 msgid "Primary Phone"
 msgstr "Əsas Telefon"
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr "və %d başqa kart."
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "və bir başqa kart."
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "Ünvan dəftərinə qeyd et"
 
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+#, fuzzy
+msgid "Width"
+msgstr "En :"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "Hündürlük :"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+#, fuzzy
+msgid "Field"
+msgstr "_Göndərən Girişi"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "Soyad"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+#, fuzzy
+msgid "Text Model"
+msgstr "Mətn Bö_yüklüyü"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#, fuzzy
+msgid "Column Width"
+msgstr "Kolumbiya"
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 #, fuzzy
 msgid ""
 "\n"
@@ -3249,7 +3298,7 @@ msgstr ""
 "\n"
 "Buraya cüt-tıqlayaraq bir əlaqə üzvünü yarat."
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 #, fuzzy
 msgid ""
 "\n"
@@ -3262,21 +3311,41 @@ msgstr ""
 "\n"
 "Buraya cüt-tıqlayaraq bir əlaqə üzvünü yarat."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:452
+#, fuzzy
+msgid "Adapter"
+msgstr "Andorra"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Silinən"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Vəzifə nizamlanması"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Kart Nümayişi "
 
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#, fuzzy
+msgid "GTK Tree View"
+msgstr "Həftəlik Nümayiş"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Zərfi çap et"
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Kartları çap et"
 
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
 msgid "Print card"
 msgstr "Kartı çap et"
 
@@ -3349,7 +3418,6 @@ msgid "Include:"
 msgstr "Daxil et :"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Mənzərə"
 
@@ -3369,17 +3437,16 @@ msgstr "Kənarlar"
 msgid "Number of columns:"
 msgstr "Sütunların miqdarı :"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Seçənəklər"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "İstiqamət"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Səhifə"
 
@@ -3395,9 +3462,7 @@ msgstr "Kağız"
 msgid "Paper source:"
 msgstr "Kağız qaynağı :"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Portret"
 
@@ -3457,43 +3522,167 @@ msgstr "_Yazı növü ..."
 msgid "Untitled appointment"
 msgstr "Adsız görüş"
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr "1.nci"
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "2-ci"
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "3.ncü"
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr "4.ncü"
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr "5.nci"
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr "6.ncı"
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr "7.nci"
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr "8.nci"
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr "9.ncu"
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr "10.ncu"
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr "11.nci"
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr "12-ci"
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr "13.ncü"
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr "14.ncü"
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr "15.nci"
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr "16.ncı"
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr "17.nci"
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr "18.nci"
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr "19.ncu"
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr "20.nci"
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr "21.nci"
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "22-ci"
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "23.ncü"
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr "24.ncü"
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr "25.nci"
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr "26.ncı"
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr "27.nci"
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr "28.nci"
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr "29.ncu"
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr "39.ncu"
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr "31.nci"
+
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "Yüksək"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1721
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "Alçaq"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr "Təsvirsiz"
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Təqvim vericisi ilə bağlantı qurulurkən xəta oldu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot Təqvim əlavələri bloku oxuna bilmədi"
 
@@ -3502,89 +3691,80 @@ msgstr "Pilot Təqvim əlavələri bloku oxuna bilmədi"
 msgid "Default Priority:"
 msgstr "_Üstünlük:"
 
-#: calendar/conduits/todo/todo-conduit.c:951
 #: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot Ediləcəklər əlavələri bloku oxuna bilmədi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Təqvim göstərən Bonobo idarə nümunəsi."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Təqvim göstərən Bonobo idarə nümunəsi."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #, fuzzy
 msgid "Calendar and Tasks"
 msgstr "Təqvim və Vəzifə Qurğuları"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Evolutionun məktub yazıçısı emalatxanası."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Təqvim və Vəzifə Qurğuları"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Evolutionun Təqvim əlavəsi."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolutionun İcracı mündəricat parçası."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Evolution Tasks control"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
 msgstr "Evolutionun Vəzifə parçası emalatxanası."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr "Təqvim iTip nümayiş idarəsi emalatxanası."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
-msgstr "Nümunəvi Təqvim idarəsi emalaxanası"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Təqvim editor dialoqları mərkəzləşdirmə emalatxanası."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "Factory to create a component editor factory"
-msgstr "Evolutionun komponent editor parçasının emalatxanası."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Xəbər Düzəldicisi"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Alarm vermə xidməti"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution Xəbər Düzəldicisi"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
 msgstr "Alarm vermə xidməti emalatxanası"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Starting:"
 msgstr "Qurğular"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 #, fuzzy
 msgid "Ending:"
 msgstr "İndekslənir:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr "səhv vaxt"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
 #, c-format
 msgid "Alarm on %s"
 msgstr "%s vaxtı alarm ver"
@@ -3606,11 +3786,17 @@ msgstr "Xəbərdarlıq vaxtı ( dəqiqə )"
 msgid "_Edit appointment"
 msgstr "Görüşü _düzəlt"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "İzahat yoxdur."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:741
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
+msgid "Warning"
+msgstr "Xəbərdarlıq"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:849
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3622,13 +3808,7 @@ msgstr ""
 "üçün qurulubdur.  Evolution yerinə normal\n"
 "xatırlatma ekranı göstərəcəkdir."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Xəbərdarlıq"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:764
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3645,16 +3825,16 @@ msgstr ""
 "\n"
 "Həqiqətən də bu proqramı icra etmək istəyirsiniz?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:778
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Mənə bir də soruşma."
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "GNOME başladıla bilmədi"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "gnome-vfs-ni başlada bilmədim"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm vermə xidməti emalatxanası yaradıla bilmir"
 
@@ -3670,36 +3850,36 @@ msgstr "Daxil edən izah"
 msgid "Comment contains"
 msgstr "Daxil edən şərh"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr "Oxşar Olmayan"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %b %d"
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:409 calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:416
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:440 calendar/gui/calendar-commands.c:442
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3710,67 +3890,168 @@ msgstr ""
 "Təqvimin görünüşü quraşdırıla bilmir. Lütfən ORBIT və OAF qurğularınızı "
 "yoxlayın."
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
+msgid "Calendar"
+msgstr "Təqvim"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "Görüş və hadisələri daxil edən qovluq"
+
+#: calendar/gui/calendar-component.c:75
+#, fuzzy
+msgid "Public Calendar"
+msgstr "_Ümumi Təqvim URL:"
+
+#: calendar/gui/calendar-component.c:76
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Görüş və hadisələri daxil edən qovluq"
+
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
+msgid "Tasks"
+msgstr "Vəzifə"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "Ediləcəkləri daxil edən qovluq"
+
+#: calendar/gui/calendar-component.c:85
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Kartları çap et"
+
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Ediləcəkləri daxil edən qovluq"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "New appointment"
+msgstr "Yeni İclas"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "_Appointment"
+msgstr "İclas"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Yeni bir iclas yarat"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "New meeting"
+msgstr "Xəbərlər Qurğuları"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "_Meeting"
+msgstr "İclas"
+
+#: calendar/gui/calendar-component.c:736
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Yeni bir vəzifə yarat"
+
+#: calendar/gui/calendar-component.c:740
+#, fuzzy
+msgid "New task"
+msgstr "Yeni Vəzifə"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_Vəzifə"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Yeni bir vəzifə yarat"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Yeni İclas"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Yeni _Görüş"
+
+#: calendar/gui/calendar-component.c:746
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Yeni bir iclas yarat"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Şəxsi"
 
-#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
+#: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
 msgid "Public"
 msgstr "Ümumi"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "Baz."
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "Çərş."
 
-#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
+#: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "Boş"
 
-#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1165
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr "Məşğul"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "Başlamayıb"
 
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "İşləyir"
 
-#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "Bitirmə Tarixi"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3781,345 +4062,155 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
-#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
-#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:79
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "Yoxdur"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Təkrarlayan"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
-#: calendar/gui/e-meeting-model.c:862
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
+#: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr "Bəli"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:863
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Xeyr"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Gündəlik Nümayiş"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "İş Həftəsi Nümayişi"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "Həftəlik Nümayiş"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "Aylıq Nümayiş"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
-msgid "Calendar"
-msgstr "Təqvim"
-
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr "Görüş və hadisələri daxil edən qovluq"
-
-#: calendar/gui/component-factory.c:76
-#, fuzzy
-msgid "Public Calendar"
-msgstr "_Ümumi Təqvim URL:"
-
-#: calendar/gui/component-factory.c:77
-#, fuzzy
-msgid "Public folder containing appointments and events"
-msgstr "Görüş və hadisələri daxil edən qovluq"
-
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
-#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1063
-msgid "Tasks"
-msgstr "Vəzifə"
-
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
-msgstr "Ediləcəkləri daxil edən qovluq"
-
-#: calendar/gui/component-factory.c:86
-#, fuzzy
-msgid "Public Tasks"
-msgstr "Kartları çap et"
-
-#: calendar/gui/component-factory.c:87
-#, fuzzy
-msgid "Public folder containing to-do items"
-msgstr "Ediləcəkləri daxil edən qovluq"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "New appointment"
-msgstr "Yeni İclas"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "_Appointment"
-msgstr "İclas"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "Yeni bir iclas yarat"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "New meeting"
-msgstr "Xəbərlər Qurğuları"
-
-#: calendar/gui/component-factory.c:755
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
-msgid "_Meeting"
-msgstr "İclas"
-
-#: calendar/gui/component-factory.c:756
-#, fuzzy
-msgid "Create a new meeting request"
-msgstr "Yeni bir vəzifə yarat"
-
-#: calendar/gui/component-factory.c:760
-#, fuzzy
-msgid "New task"
-msgstr "Yeni Vəzifə"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "_Vəzifə"
-
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "Yeni bir vəzifə yarat"
-
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "New All Day Appointment"
-msgstr "Yeni İclas"
+msgid "Error while opening the calendar"
+msgstr "Təqvim vericisi ilə bağlantı qurulurkən xəta oldu"
 
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "All _Day Appointment"
-msgstr "Yeni _Görüş"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
 
-#: calendar/gui/component-factory.c:766
+#: calendar/gui/comp-editor-factory.c:473
 #, fuzzy
-msgid "Create a new all-day appointment"
-msgstr "Yeni bir iclas yarat"
+msgid "Permission denied to open the calendar"
+msgstr "Qadağandır"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "Təqvimin göstərəcəyi URI"
 
-#: calendar/gui/control-factory.c:174
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Səsli Alarm Seçənəkləri"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "İsmarış Alarm Seçənəkləri"
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Məktub Alarm Seçənəkləri"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Proqram Alarm Seçənəkləri"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Naməlum Alarm Seçənəkləri"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Alarm Təkrarlaması"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-#, fuzzy
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
-msgstr ""
-"Bu məktub xatırladıcısıdır, amma Evolution bunu hələ ki dəstəkləmir. Bu "
-"xatırladıcı seçənəklərini işlədə bilməyəcəksiniz."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Göstəriləcək İsmarış"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "İsmarış Gövdəsi"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Səs çal:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Alarmı təkrarla"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Proqramı işə sal: "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Göndər"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Bu arqumentlərlə:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
-#: filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
 msgid "days"
 msgstr "gün"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "hər əlavə vaxtda"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
-#: filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
-#: filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "dəqiqə"
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
-msgstr "%d gün"
-
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
-msgstr "1 gün"
-
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
-msgstr "%d həftə"
-
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "1 həftə"
-
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
-msgstr "%d saat"
-
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
-msgstr "1 saat"
-
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
-msgstr "%d dəqiqə"
-
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
-msgstr "1 dəqiqə"
-
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
-msgstr "%d saniyə"
-
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
-msgstr "1 saniyə"
-
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "Səs çal"
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "İsmarış göstər"
-
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "ePoçt göndər"
-
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Proqramı işə sal"
-
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
-msgstr "Naməlum gediş aparıldı"
-
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "iclasın başlamasından %s %s əvvəl"
-
-#: calendar/gui/dialogs/alarm-page.c:416
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "iclasın başlamasından %s %s sonra"
-
-#: calendar/gui/dialogs/alarm-page.c:421
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "iclasın başlanğıcının %s"
-
-#: calendar/gui/dialogs/alarm-page.c:430
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "iclasın qurtarmasından %s %s əvvəl"
-
-#: calendar/gui/dialogs/alarm-page.c:433
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "iclas qurtarandan %s %s sonra"
-
-#: calendar/gui/dialogs/alarm-page.c:438
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "iclas qurtarandan %s sonra"
-
-#: calendar/gui/dialogs/alarm-page.c:462
-#, c-format
-msgid "%s at %s"
-msgstr "%s %s"
-
-#: calendar/gui/dialogs/alarm-page.c:468
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "naməlum tətik növü üçün %s"
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4130,46 +4221,63 @@ msgstr "Əsaslar"
 msgid "Date/Time:"
 msgstr "Tarix/Vaxt:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "İsmarış göstər"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Səs çal"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Xatırladıcılar"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Proqramı işə sal"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "ePoçt göndər"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Mündəricat:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Seçənəklər..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "sonra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "əvvəl"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "gün(lər)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "görüşün sonu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "dəqiqə"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "iclasın başlanğıcı"
 
@@ -4193,7 +4301,7 @@ msgstr "30 dəqiqə"
 msgid "60 minutes"
 msgstr "60 dəqiqə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Alerts"
 msgstr "Alarm"
@@ -4219,7 +4327,8 @@ msgid "Days"
 msgstr "Gün"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Cümə"
 
@@ -4232,7 +4341,8 @@ msgid "Minutes"
 msgstr "Dəqiqə"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Bazar ertəsi"
 
@@ -4242,7 +4352,8 @@ msgid "S_un"
 msgstr "Ba_z"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Şənbə"
 
@@ -4255,7 +4366,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Vaxt səyyahında həftə _sayısını göstər"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1137
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Bazar"
 
@@ -4274,7 +4386,8 @@ msgid "Task List"
 msgstr "_Vəzifə Siyahısı"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Cümə Axşamı"
 
@@ -4291,7 +4404,8 @@ msgid "Time format:"
 msgstr "Vaxt Şəkli:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Çərşənbə axşamı"
 
@@ -4300,7 +4414,8 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Çərşənbə"
 
@@ -4343,7 +4458,7 @@ msgid "_Fri"
 msgstr "_Cüm"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Ümumi"
 
@@ -4388,159 +4503,163 @@ msgstr "_Çər"
 msgid "before every appointment"
 msgstr "iclas başlamadan əvvəl"
 
-#: calendar/gui/dialogs/cancel-comp.c:56
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:59
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Bu iclası həqiqətən də ləğv edib silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/cancel-comp.c:65
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Bu vəzifəni həqiqətən də ləğv edib silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/cancel-comp.c:74
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:77
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Bu jurnal girişini həqiqətən də ləğv edib silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Bu hadisə silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Bu vəzifə silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Bu jurnal girişi silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Siz dəyişikliklər apardınız. Bu dəyişiklikləri nəzərə almayıb editoru "
 "qapadaq?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Siz dəyişikliklər aparmadınız. Editoru qapadaq?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Hadisə dəyişdirildi."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Bu vəzifə dəyişdirildi."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Bu jurnal girişi dəyişdirildi."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Siz dəyişikliklər apardınız. Bu dəyişiklikləri nəzərə almayıb editoru "
 "güncəlləyək?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Siz dəyişikliklər aparmadınız. editoru güncəlləşdirək?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Naməlum xəta: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " buraya "
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
 msgstr " (Qurtarılıb "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 msgid "Completed "
 msgstr "Qurtarılıb "
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr " (Ait "
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr "Aidiyyət"
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Cism güncəllənə bilmədi!"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
 #, fuzzy
 msgid "Could not update object"
 msgstr "Cism güncəllənə bilmədi!"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "İclası düzəlt"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "İclas - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Vəzifə - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Jurnal üzvü - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
-#: calendar/gui/dialogs/comp-editor.c:1221
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
-#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr "Fərqli qeyd et ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1322
-#: calendar/gui/dialogs/comp-editor.c:1346
-#: calendar/gui/dialogs/comp-editor.c:1370
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1331
+#: calendar/gui/dialogs/comp-editor.c:1355
+#: calendar/gui/dialogs/comp-editor.c:1379
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "Hazırkı buraxılış öyrənilə bilmədi!"
 
@@ -4598,90 +4717,103 @@ msgstr "Nümayəndələşdir:"
 msgid "Enter Delegate"
 msgstr "Nümayəndəni Bildir"
 
-#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "İclas"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Xatırladıcı"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Təkrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:433
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr "Vaxtlaşdırılır"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "İclas"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
+#, fuzzy
+msgid "Start date is wrong"
+msgstr "Başlama Tarixi"
+
+#: calendar/gui/dialogs/event-page.c:610
+msgid "End date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:633
+#, fuzzy
+msgid "Start time is wrong"
+msgstr "_Başlama vaxt:"
+
+#: calendar/gui/dialogs/event-page.c:640
+msgid "End time is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "Günün bü_tün hadisələri"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "Mə_şğul"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Sinifləndirmələr"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "Gi_zli"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Tarix və Vaxt"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "B_oş"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 #, fuzzy
 msgid "L_ocation:"
 msgstr ""
 "\n"
 "Coğrafi Yerləşmə:  "
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Xü_susi"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Üm_umi"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Vaxt Fərqli Göstər"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Mü_ndəricat:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Əlaqələr ..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "_Sonlanma vaxtı:"
@@ -4690,19 +4822,23 @@ msgstr "_Sonlanma vaxtı:"
 msgid "_Start time:"
 msgstr "_Başlama vaxt:"
 
-#: calendar/gui/dialogs/meeting-page.c:414
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr "Təşkilatçı lazımdır."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "Ən az bir dinləyici lazımdır."
 
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "Bu şəxs onsuz da iclasın dinləyicisidir!"
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Təmsil Et..."
 
@@ -4743,16 +4879,11 @@ msgid "Member"
 msgstr "Üzv"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rolu"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
@@ -4760,13 +4891,6 @@ msgstr "Rolu"
 msgid "Status"
 msgstr "Hal"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "Növ"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4777,106 +4901,87 @@ msgid "_Change Organizer"
 msgstr "Təşkilatçını _Dəyişdir"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr "Başqalarını _Dəvət Et ..."
 
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-#, fuzzy
-msgid "st"
-msgstr "1.nci"
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-#, fuzzy
-msgid "nd"
-msgstr "2-ci"
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
+#: calendar/gui/dialogs/recur-comp.c:75
 #, fuzzy
-msgid "rd"
-msgstr "3.ncü"
+msgid "This and Future Instances"
+msgstr "Vallis Və Futuna Adaları"
 
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-msgid "th"
-msgstr "."
+#: calendar/gui/dialogs/recur-comp.c:77
+#, fuzzy
+msgid "All Instances"
+msgstr "Büt_ün dayancaqlar:"
 
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Bu görüşdə \"Evolution\"un düzəldə bilməyəcəyi hallar var."
 
-#: calendar/gui/dialogs/recurrence-page.c:898
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "..da"
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 #, fuzzy
 msgid "first"
 msgstr "siyahı"
 
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "saniyə"
 
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
 #, fuzzy
 msgid "third"
 msgstr "Başqa"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 #, fuzzy
 msgid "fourth"
 msgstr "Şimal"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 #, fuzzy
 msgid "last"
 msgstr "siyahı"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 #, fuzzy
 msgid "Other Date"
 msgstr "Başqa faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "gün"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "...da (də)"
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "hadisələr"
 
@@ -4940,24 +5045,29 @@ msgstr "həftə"
 msgid "year(s)"
 msgstr "il"
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:58
 #, fuzzy
 msgid "The meeting information has been created. Send it?"
 msgstr "İclas məlumatı dəyişdir. Güncəllənmiş buraxılışını yollayaq?"
 
-#: calendar/gui/dialogs/send-comp.c:59
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "İclas məlumatı dəyişdir. Güncəllənmiş buraxılışını yollayaq?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:68
 #, fuzzy
 msgid "The task assignment information has been created. Send it?"
 msgstr "Vəzifə məlumatı dəyişdir. Güncəllənmiş buraxılışını yollayaq?"
 
-#: calendar/gui/dialogs/send-comp.c:70
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr "Vəzifə məlumatı dəyişdir. Güncəllənmiş buraxılışını yollayaq?"
 
+#: calendar/gui/dialogs/task-details-page.c:397
+#, fuzzy
+msgid "Completed date is wrong"
+msgstr "Qurtarılıb "
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -4968,42 +5078,40 @@ msgstr "% Qurtardı"
 msgid "Date Completed:"
 msgstr "Bitirmə Tarixi:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
-msgid "Needs Action"
-msgstr "Hərəkət Lazımdır"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Gedişat"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:860
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Üstünlük:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Hal:"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Əsas"
 
-#: calendar/gui/dialogs/task-editor.c:216
-#: calendar/gui/dialogs/task-editor.c:261
-#: calendar/gui/dialogs/task-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
+#: calendar/gui/dialogs/task-page.c:527
+msgid "Due date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "İzah :"
 
@@ -5011,139 +5119,236 @@ msgstr "İzah :"
 msgid "Sta_rt Date:"
 msgstr "Başla_ma Tarixi:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Əlaqələr ..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Bu tarixə qədər :"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d gün"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 gün"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d həftə"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 həftə"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d saat"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 saat"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d dəqiqə"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 dəqiqə"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d saniyə"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 saniyə"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "ePoçt göndər"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Naməlum gediş aparıldı"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "iclasın başlamasından %s %s əvvəl"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "iclasın başlamasından %s %s sonra"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "iclasın başlanğıcının %s"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "iclasın qurtarmasından %s %s əvvəl"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "iclas qurtarandan %s %s sonra"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "iclas qurtarandan %s sonra"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "naməlum tətik növü üçün %s"
+
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:418
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:419
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:420
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:421
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:422
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:423
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-calendar-table.c:424
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-calendar-table.c:425
 #, fuzzy, c-format
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
-#: calendar/gui/e-week-view.c:1917
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1910
 msgid "Deleting selected objects"
 msgstr "Seçili üzv silinir"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
-#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
-#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Aç"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 #, fuzzy
 msgid "_Save as..."
 msgstr "Fərqli qeyd et ..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
-#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Çap Et ..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
-#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kə_s"
 
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
-#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Köçürt"
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
-#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Yapışdır"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Vəzifə Ver"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "v_Calendar şəklində çatdır"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "Qurtardı deyə _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Vəzifələri Qurtardı deyə _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "Seçili Vəzifələri _Sil"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
-#: calendar/gui/e-week-view.c:4240
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr "Cismlər güncəllənir"
 
-#: calendar/gui/e-calendar-table.c:1360
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Vəzifə əlavə etmək üçün tıqla"
@@ -5152,8 +5357,8 @@ msgstr "Vəzifə əlavə etmək üçün tıqla"
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1096
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Qurtar"
 
@@ -5182,8 +5387,8 @@ msgid "Start Date"
 msgstr "Başlama Tarixi"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:748
-#: shell/e-shortcuts.c:1051
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Mündəricat"
 
@@ -5191,19 +5396,15 @@ msgstr "Mündəricat"
 msgid "Task sort"
 msgstr "Vəzifə nizamlanması"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:166
+#: e-util/e-time-utils.c:379
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:161
+#: e-util/e-time-utils.c:388
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -5218,139 +5419,217 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:518
+#: calendar/gui/e-day-view-time-item.c:529
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i dəqiqə bölmələri"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Yeni _Görüş"
 
-#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "Yeni Bütün Gün _Hadisəsi"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 #, fuzzy
 msgid "New Meeting"
 msgstr "İclas"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "Yeni Vəzifə"
 
-#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Çap Et ..."
 
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "_Bugünə Get"
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "Tarixə _Get..."
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatını _Dərc Et"
 
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Məktub Qurğuları..."
 
-#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
-#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Fərqli _Qeyd Et ..."
 
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Görüşləri Planlaşdır"
 
-#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "v_Calendar şəklində çatdır"
 
-#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr "Bu Vaqeənin _Daşına Bilməsinə İmkan Ver"
 
-#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr "Bu _Vaqeəni Sil"
 
-#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr "_Bütün Vaqeələri Sil"
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "_Bəsit təkrarlama"
+
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "Hər"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d gün"
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "Hər"
+
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr "%d həftə"
+
+#: calendar/gui/e-itip-control.c:729
+msgid "Every week on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:731
+#, fuzzy, c-format
+msgid "Every %d weeks on "
+msgstr "%d həftə"
+
+#: calendar/gui/e-itip-control.c:739
+#, fuzzy
+msgid " and "
+msgstr "Qum"
+
+#: calendar/gui/e-itip-control.c:746
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:764
+#, fuzzy
+msgid "every month"
+msgstr "Bir a_y"
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:775
+#, fuzzy
+msgid "Every year"
+msgstr "Hər"
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:831
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Sonlanır: <b>"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Qurtarılıb "
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "iCalendar Məlumatı"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "iCalendar Xətası"
 
-#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
-#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 msgid "An unknown person"
 msgstr "Naməlum şəxs"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5358,347 +5637,348 @@ msgstr ""
 "<br> Xahiş edirik, aşağıdakı məlumatı gözdən keçirdin və aşağıdakı menüdən "
 "gediçi seçin."
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Heç biri</i>"
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "Coğrafi Yerləşmə:  "
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
 #, fuzzy
 msgid "Status:"
 msgstr "_Hal:"
 
-#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:490
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Qəbul Edildi"
 
-#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Girişimli qəbul et"
 
-#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Rədd Edildi"
 
-#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
-#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:444
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "Naməlum"
 
-#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 msgid "Choose an action:"
 msgstr "Gediş seç:"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Güncəllə"
 
-#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Oldu"
 
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Qəbul Et"
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Girişimli qəbul et"
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Rədd Et"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatını Yolla"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Cavablayıcı vəziyyətini güncəllə"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Ən Son Məlumatı Yolla"
 
-#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
-#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Ləğv Et"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> görüş məlumatını dərc edib."
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Görüş Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1326
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> sizin görüşdə olmağınızı xahiş edir."
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> sizin görüşdə olmağınızı xahiş edir."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Görüş Məqsədi"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> mövcud görüşə əlavə etmək istəyir."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Görüş Güncəllənməsi"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ən son görüş məlumatını almaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Görüş Güncəllənmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> görüş istəyini cavabladı."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Görüş Cavabı"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> görüşü ləğv etdi."
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Görüş Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
-#: calendar/gui/e-itip-control.c:1245
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> pozğun ismarış yolladı."
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Pis Görüş İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> vəzifə məlumatını dərc etdi."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Vəzifə Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1393
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> sizdən vəzifəni görməyinizi istədi."
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> sizdən vəzifəni görməyinizi istədi."
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Vəzifə Təklifi"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> mövcud vəzifəyə qoşulmaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Vəzifə Gencəllənməsi"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ən son vəzifə məlumatını almaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Vəzifə Güncəllənmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> vəzifə verilməsinə cavab verdi."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Vəzifə Cavabı"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> vəzifəni ləğv etdi."
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Vəzifə Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Pis Vəzifə İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> sərbəst/məşğul məlumatını dərc etdi."
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> sizin sərbəst/məşğul məlumatınızı istəyir."
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Sərbəst/Məşğul İstəyi"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> sərbəst/məşğul istəyinə cavab verdi."
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Sərbəst/Məşğul Cavabı"
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Pis Sərbəst/Məşğul İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1541
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Qovluq geri dönülməz şəkildə xəsarət alıb."
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Bu ismarış təkə dəstəklənməyən istəklər daxil edir."
 
-#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr "İlişgidəki hökmlü təqvim ismarışı daxil etmir"
 
-#: calendar/gui/e-itip-control.c:1441
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "İlişgidəki göstəriləbilən təqvim üzvləri daxil etmir"
 
-#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1916
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Gübcəlləmə Qurtardı\n"
 
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Təqvim faylı güncəllənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "İştirakçı vəziyyəti üzvün artıq mövcud olmadığından ötrü güncəllənə bilmədi"
 
-#: calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1739
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "İştirakçı vəziyyəti səhv haldan ötrü güncəllənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:2008
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "İştirakçı vəziyyəti güncəlləndi\n"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:2014
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "İştirakçı vəziyyəti güncəllən bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Çıxartma Qurtardı"
 
-#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr "Üzv göndərildi!\n"
 
-#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2206
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Qovluq Seçin"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Qovluq Seçin"
@@ -5740,223 +6020,227 @@ msgstr "bitiş tarixi"
 msgid "date-start"
 msgstr "başlama tarixi"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr "Lazımi İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Ehtiyatdakı İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Resources"
 msgstr "Mənbə"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr "Şəxsi"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:831
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "Qrup"
 
-#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "Mənbə"
 
-#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr "Otaq"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr "Stul"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr "Lazımi İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
+#: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr "Ehtiyatdakı İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
+#: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr "Qeyri İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+msgid "Needs Action"
+msgstr "Hərəkət Lazımdır"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr "Girişimli"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:879
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr "Temsil Edildi"
 
-#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 msgid "In Process"
 msgstr "İşləyir"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2114
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr "%a %B %d %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
+#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "İş Yerində Deyil"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Məlumat Yoxdur"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Seçənəklər"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Sadəcə olaraq -İş Saatlarını Göstər"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "_Uzaqlaşdıraraq Göstər"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "Sərbəst/Məşğulları _Təzələ"
 
-#: calendar/gui/e-meeting-time-sel.c:544
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr "_Avtomarik Olaraq Seç"
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr "_Bütün Adamlar və Qaynaqlar"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Bütün _adamlar və Bir Qaynaq"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "_Lazımi Adamlar"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Lazımi Adamlar və _Bir Qaynaq"
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "İclas başlama saatı :"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "İclas sonlanma saatı :"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
 #: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Vəzifələr %s vaxtl açılır"
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "`%s' dakı (dəki) vəzifələr yüklənə bilmədi"
 
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' i(ı) yükləməyə yarayan yol dəstəklənmir"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "%s başladırkən xəta oldu"
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Qurtarma Vaxtı"
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Seçili üzv silinir"
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 #, fuzzy
 msgid "Expunging"
 msgstr "Qovluq açılır"
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Yeni _Görüş..."
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/gnome-cal.c:1541
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' i(ı) açmağa yarayan yol dəstəklənmir"
 
-#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1581
+#: calendar/gui/gnome-cal.c:1563
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "%s vaxtı alarm ver"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5964,7 +6248,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5972,7 +6256,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1996
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Təqvim %s vaxtı açılır"
@@ -6038,325 +6322,183 @@ msgstr "Oktyabr"
 msgid "September"
 msgstr "Sentyabr"
 
-#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr "Təşkilatçı bildirlməlidir."
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:298
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "Ən az bir dinləyici vacibdir"
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 #, fuzzy
 msgid "Event information"
 msgstr "təqvim məlumatı"
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 #, fuzzy
 msgid "Task information"
 msgstr "Vəzifə Məlumatı"
 
-#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 #, fuzzy
 msgid "Journal information"
 msgstr "Arzuya Bağlı Məlumatlar"
 
-#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Sərbəst/Məşğul Məlumatı"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 #, fuzzy
 msgid "Calendar information"
 msgstr "təqvim məlumatı"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 #, fuzzy
 msgid "Updated"
 msgstr "Güncəllə"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
 #, fuzzy
 msgid "Refresh"
 msgstr "Siyahını Yenilə"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:513
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Sərbəst/Məşğul Məlumatı"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 #, fuzzy
 msgid "iCalendar information"
 msgstr "təqvim məlumatı"
 
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Siz hadisənin istirakçısı olmalısınız."
 
-#: calendar/gui/main.c:70
-#, fuzzy
-msgid "Could not activate Bonobo"
-msgstr "Bonoboyu başlada bilmədim"
-
-#: calendar/gui/main.c:99
-msgid "Could not create the component editor factory"
-msgstr "Komponent düzəltmə emalatxanası yaradıla bilmir"
-
-#: calendar/gui/print.c:456
-msgid "1st"
-msgstr "1.nci"
-
-#: calendar/gui/print.c:456
-msgid "2nd"
-msgstr "2-ci"
-
-#: calendar/gui/print.c:456
-msgid "3rd"
-msgstr "3.ncü"
-
-#: calendar/gui/print.c:456
-msgid "4th"
-msgstr "4.ncü"
-
-#: calendar/gui/print.c:456
-msgid "5th"
-msgstr "5.nci"
-
-#: calendar/gui/print.c:457
-msgid "6th"
-msgstr "6.ncı"
-
-#: calendar/gui/print.c:457
-msgid "7th"
-msgstr "7.nci"
-
-#: calendar/gui/print.c:457
-msgid "8th"
-msgstr "8.nci"
-
-#: calendar/gui/print.c:457
-msgid "9th"
-msgstr "9.ncu"
-
-#: calendar/gui/print.c:457
-msgid "10th"
-msgstr "10.ncu"
-
-#: calendar/gui/print.c:458
-msgid "11th"
-msgstr "11.nci"
-
-#: calendar/gui/print.c:458
-msgid "12th"
-msgstr "12-ci"
-
-#: calendar/gui/print.c:458
-msgid "13th"
-msgstr "13.ncü"
-
-#: calendar/gui/print.c:458
-msgid "14th"
-msgstr "14.ncü"
-
-#: calendar/gui/print.c:458
-msgid "15th"
-msgstr "15.nci"
-
-#: calendar/gui/print.c:459
-msgid "16th"
-msgstr "16.ncı"
-
-#: calendar/gui/print.c:459
-msgid "17th"
-msgstr "17.nci"
-
-#: calendar/gui/print.c:459
-msgid "18th"
-msgstr "18.nci"
-
-#: calendar/gui/print.c:459
-msgid "19th"
-msgstr "19.ncu"
-
-#: calendar/gui/print.c:459
-msgid "20th"
-msgstr "20.nci"
-
-#: calendar/gui/print.c:460
-msgid "21st"
-msgstr "21.nci"
-
-#: calendar/gui/print.c:460
-msgid "22nd"
-msgstr "22-ci"
-
-#: calendar/gui/print.c:460
-msgid "23rd"
-msgstr "23.ncü"
-
-#: calendar/gui/print.c:460
-msgid "24th"
-msgstr "24.ncü"
-
-#: calendar/gui/print.c:460
-msgid "25th"
-msgstr "25.nci"
-
-#: calendar/gui/print.c:461
-msgid "26th"
-msgstr "26.ncı"
-
-#: calendar/gui/print.c:461
-msgid "27th"
-msgstr "27.nci"
-
-#: calendar/gui/print.c:461
-msgid "28th"
-msgstr "28.nci"
-
-#: calendar/gui/print.c:461
-msgid "29th"
-msgstr "29.ncu"
-
-#: calendar/gui/print.c:461
-msgid "30th"
-msgstr "39.ncu"
-
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr "31.nci"
-
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "Baz."
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "B.ei"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Ç.a"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Çə"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "C.a"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Cümə"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "Şn"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Seçili gün ( %a %b %d %Y )"
 
-#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
-#: calendar/gui/print.c:1896
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Seçili həftə ( %s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Seçili ay ( %b %Y )"
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Seçili il ( %Y )"
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 #, fuzzy
 msgid "Task"
 msgstr "_Vəzifə"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "Hal: %s"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Üstünlük:"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Qurtaran Nisbət: %i"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2364
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr "Kateqoriyalar: %s"
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Əlaqələr:"
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Təqvimi çap et"
-
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
-#: my-evolution/e-summary.c:633
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "Çap Etmə nümayişi"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Üzvü çap et"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Çap Qurğuları"
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Vəzifə görünüşü yaradıla bilmir. Lütfən ORBIT və OAF qurğularınızı yoxlayın."
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "Göstəriləcək vəzifələr qovluğunun URIsi"
 
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:472
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6369,95 +6511,54 @@ msgstr ""
 "\n"
 "İsmarışları həqiqətən də silək?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
-#: mail/mail-callbacks.c:2912
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "Mənə bir də soruşma."
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Kartları çap et"
 
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-"\"Evolution\" təqvim qovluğunda olan vəzifələri yeni qovluqlara daşıdı."
-
-#: calendar/gui/tasks-migrate.c:108
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-"\"Evolution\" təqvim qovluğunda olan vəzifələri yeni qovluqlara daşımağa "
-"cəhd etdi.\n"
-"Bəzi vəzifələr daşına bilmədi. Ona görə də bu əməliyyat gələcəkdə də "
-"aparılmalıdır."
-
-#: calendar/gui/tasks-migrate.c:120
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-"`%s' tapıla bilmədi; təqvim qovluğuna heç bir vəzifə vəzifələr qovluğuna "
-"daşına bilməyəcək."
-
-#: calendar/gui/tasks-migrate.c:133
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-"`%s' yükləmək üçün işlədiləcən metod dəstəkləmir;  təqvim qovluğuna heç bir "
-"vəzifə vəzifələr qovluğuna daşına bilməyəcək."
-
-#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
 msgid "SMTWTFS"
 msgstr "BBeÇaÇCaCŞ"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "VCard fayllarını Evolution içinə gətirən emalatxana."
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 #, fuzzy
-msgid "Imports iCalendar files into Evolution"
-msgstr "VCard fayllarını Evolution içinə gətirir."
+msgid "Evolution iCalendar importer"
+msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 #, fuzzy
-msgid "Imports vCalendar files into Evolution"
-msgstr "VCard fayllarını Evolution içinə gətirir."
+msgid "Evolution vCalendar importer"
+msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
 
-#: calendar/importers/icalendar-importer.c:168
-#, fuzzy, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr ""
-"İsmarış alına bilmir: %s qovluğundan %s\n"
-"   %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Təqvim İsmarışı"
 
-#: calendar/importers/icalendar-importer.c:180
-#, fuzzy, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Ambara bağlana bilmirəm: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
+msgstr ""
 
-#: calendar/importers/icalendar-importer.c:483
+#: calendar/importers/icalendar-importer.c:404
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Xatırladıcı"
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Təqvim İsmarışı"
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:663
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6466,11 +6567,15 @@ msgstr ""
 "Evolution Pine məktub faylları tapdı.\n"
 "Onları proqramımıza idxal edək?"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Təqvim"
 
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "indiki-vaxt 0 arqument gözləyir"
@@ -8217,30 +8322,40 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "Bu şifrləmə ilə imza dəstəklənmir"
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Bu qeydlərdə təsdiqləmə dəstəklənmir"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Bu qeydlərdə şifrləmə dəstəklənmir"
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Bu qeydlərdə şifr açma dəstəklənmir"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "Bu qeydlərdə şifr açma dəstəklənmir"
+
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "Bu qeydlərdə şifr açma dəstəklənmir"
+
+#: camel/camel-data-cache.c:133
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr ""
 "Nəticə faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ön yaddaş qovluğunu aça bilmədim: %s"
@@ -8280,87 +8395,94 @@ msgstr "%s qovluğu saxlanılır"
 msgid "You must be working online to complete this operation"
 msgstr "Bui əməliyyatı bitirmək üçün xətdə olmalısınız"
 
-#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-process.c:92
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "%s qovluğunu yarada bilmədim: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Alıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "İşə salıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Növbə faylını aça bilmədim"
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Növbə faylını işlədə bilmirəm"
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) İsmarışı alınır"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "İsmarış açıla bilmir"
 
-#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Bacarılmayan İsmarış %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d İsmarışın %d qədərə alınır"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d nin(nın) %d ismarışında iflas etdim"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "İsmarış kodu açıla bilmir."
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Hökmsüz arqumentlər"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Hökmsüz arqumentlər"
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
-
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "İşə salıcı süzgəc axtarışı xətası: %s: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8369,7 +8491,7 @@ msgstr ""
 "Axtarış ifadəsi darana bilmir:%s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8378,11 +8500,11 @@ msgstr ""
 "İşə salıcı axtarış ifadəsi darama xətası:%s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(hamısını yoxla) tək düzgün nəticə istəyir"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Naməlum başlıqda sorǧu aparılır: %s"
@@ -8411,7 +8533,7 @@ msgstr "İsmarışlar daşınır"
 msgid "Copying messages"
 msgstr "İsmarışlar \"%s\"a(ə) köçürülür"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8419,72 +8541,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:711
+#: camel/camel-gpg-context.c:738
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:761
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:769
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
-#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
-#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr "Ləğv Edildi."
 
-#: camel/camel-gpg-context.c:771
+#: camel/camel-gpg-context.c:798
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "POP vericisindən gözlənilməz cavab alındı: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 #, fuzzy
 msgid "No data provided"
 msgstr "fayl adı bildirilməyib."
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "İsmarış kriptlənə bilmir: alıcı bildirilməyib."
 
-#: camel/camel-gpg-context.c:1082
+#: camel/camel-gpg-context.c:1125
 #, fuzzy, c-format
 msgid ""
-"Failed to GPG %s message: %s\n"
+"Failed to GPG %s: %s\n"
 "\n"
 "%.*s"
 msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1088
+#: camel/camel-gpg-context.c:1131
 #, fuzzy, c-format
-msgid "Failed to GPG %s message: %s\n"
+msgid "Failed to GPG %s: %s\n"
 msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1197
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "İsmarış kodu açıla bilmir."
 
-#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
-#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
-#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "İsmarış kodu açıla bilmir."
 
-#: camel/camel-gpg-context.c:1290
+#: camel/camel-gpg-context.c:1333
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "İsmarış təsdiqlənə bilmir: Müvəqqəti fayl yaradıla bilmir: %s"
@@ -8509,23 +8632,22 @@ msgstr "'%s' qıfıllana bilmir: lock-helper ilə protokol xətası"
 msgid "Could not lock '%s'"
 msgstr "%s qıfıllana bilmir"
 
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:93 camel/camel-lock.c:112
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s üçün qıfıl faylını yarada bilmədim: %s"
 
-#: camel/camel-lock.c:152
+#: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "%s dakı(dəki) qıfıl fayllının alınması müddəti doldu. Yenidən sına."
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2) istifadə edilərək qıfıl faylı alınması ifşlas etdi: %s"
 
-#: camel/camel-lock.c:268
+#: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "fclock(2) istifadə edilərək qıfıl faylı alınması iflas etdi: %s"
@@ -8535,51 +8657,51 @@ msgstr "fclock(2) istifadə edilərək qıfıl faylı alınması iflas etdi: %s"
 msgid "Could not check mail file %s: %s"
 msgstr "%s məktub faylı yoxlana bilmir: %s"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "%s məktub faylı açıla bilmir: %s"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Müvəqqəti məktub faylı %s açıla bilmir: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:157
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Məktubların müvəqqəti %s fayllında saxlanma xətası: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Boru yaradıla bilmədi: %s"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Çəngəllənə bilmədi: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Məktub daşıma proqramı iflas etdi: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(Naməlum xəta)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Məktub faylı oxunma xətası: %s"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Müvəqqəti məktub faylı yazılması xətası: %s"
 
-#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Müvəqqəti məktub faylı köçürülmə xətası: %s"
@@ -8596,26 +8718,26 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 #, fuzzy
 msgid "parse error"
 msgstr "Başqa xəta"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s yüklənə bilmir: Modul yükləmə bu sistemdə dəstəklənmir."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s yüklənə bilmədi: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s yüklənə bilmir: Modulda başlatma kodu yoxdur."
@@ -8671,11 +8793,11 @@ msgstr ""
 "Bu seçənək ,əgər dəstəkləyirsə, verici ilə CRAM-MD5 parolu ilə ünsiyyət "
 "quracaqdır."
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8683,41 +8805,119 @@ msgstr ""
 "Bu seçənək ,əgər dəstəkləyirsə, verici ilə DIGEST-MD5 parolu ilə ünsiyyət "
 "quracaqdır."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Verici çox uzun dəvət verir (>2048 oktet)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Verici dəvəti hökmsüzdür\n"
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr "Verici dəvətində hömksüz \"Qoruma Keyfiyyəti\" bileti vardır\n"
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr "Verici cavabındakı tanıtma məlumatı  düzgün deyildir\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Verici cavabındakı tanıtma məlumatı natamamdır\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "Verci cavabı uyğun gəlmir\n"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-gssapi.c:48
+msgid "GSSAPI"
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:50
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr ""
+"Bu seçənəklə siz vericisiyə Kerberos 4 tanıdılması yolu ilə bağlana "
+"biləcəksiniz."
+
+#: camel/camel-sasl-gssapi.c:148
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:153
+msgid "The provided target_name parameter was ill-formed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:156
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:160
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:165
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:169
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:180
+msgid "The consistency checks performed on the credential failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:183
+msgid "The referenced credentials have expired."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
+msgid "Bad authentication response from server."
+msgstr "Vericidən xətalı tanıtma istəyi alındı."
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Dəstəklənməyən növ"
+
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Bu seçənəklə siz vericisiyə Kerberos 4 tanıdılması yolu ilə bağlana "
 "biləcəksiniz."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8726,11 +8926,6 @@ msgstr ""
 "Kerberos bileti alına bilmir:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr "Vericidən xətalı tanıtma istəyi alındı."
-
 #: camel/camel-sasl-login.c:32
 #, fuzzy
 msgid "Login"
@@ -8781,7 +8976,7 @@ msgstr "Naməlum nəqliyyat işlədilərək SMTP əvvəli POP"
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "Qeyri-POP mənbəyilə ək SMTP əvvəli POP tanıtma"
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Qaydalı ifadə dərlanməsi bacarılmadı: %s: %s"
@@ -8801,37 +8996,37 @@ msgstr "'%s' URLsi ev sahibinə ehtiyac hiss edir"
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLsi yola ehtiyac hiss edir"
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "\"%s\" Həll edilir"
 
-#: camel/camel-service.c:774 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Ad axtarışında iflas etdim: %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: qovşaq tapılmadı"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: naməlum səbəb"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 #, fuzzy
 msgid "Resolving address"
 msgstr "\"%s\" Həll edilir"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: qovşaq tapılmadı"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: naməlum səbəb"
@@ -8844,12 +9039,12 @@ msgstr "_Virtual Qovluq Sehirbazı ..."
 msgid "For reading mail as a query of another set of folders"
 msgstr "Başqa qovluq dəstələrinin istəyi olan məktubların oxunması üçün"
 
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:354 camel/camel-session.c:422
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "`%s' protokolu üçün xidmətçi yoxdur"
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8858,179 +9053,179 @@ msgstr ""
 "%s qovluğunu yarada bilmədim:\n"
 "%s"
 
-#: camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:171
 #, c-format
 msgid "Please enter your password for %s"
 msgstr "%s üçün parol kəlimanizi lürfən girin"
 
-#: camel/camel-smime-context.c:203
+#: camel/camel-smime-context.c:201
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "İmzalamaq istədiyiniz vəsiqə üçün ləqəbinizin girin"
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "\"%s\" üçün imza vəsiqəsi yoxdur."
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "\"%s\" üçün kriptiya vəsiqəsi yoxdur."
 
-#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
+#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "\"%s\" üçün imza vəsiqəsi tapıla bilmir."
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr "Ümumi balk alqoritm tapıla bilmir."
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 msgid "Failed to decode message."
 msgstr "İsmarış kodu açıla bilmir."
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr "Vəsiqələr təsdiqlənə bilmir."
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Qovluq alıa bilmir: Mənbədə hökmsüz əməliyyat"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Qovluq yaradıla bilmir: Ambarda sənv əməliyyat aparılıb"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Vəsiqələr təsdiqlənə bilmir."
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 #, fuzzy
 msgid "Unable to decrypt certificate signature"
 msgstr "Vəsiqələr təsdiqlənə bilmir."
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Imza faylı : "
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 #, fuzzy
 msgid "Certificate has expired"
 msgstr "_Vəsiqə ID:"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 #, fuzzy
 msgid "Error in CRL"
 msgstr "%s yüklənərkən xəta oldu"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 #, fuzzy
 msgid "Out of memory"
 msgstr "İş Yerində Deyil"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 #, fuzzy
 msgid "Unable to verify leaf signature"
 msgstr "Vəsiqələr təsdiqlənə bilmir."
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 #, fuzzy
 msgid "Certificate Revoked"
 msgstr "_Vəsiqə ID:"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 #, fuzzy
 msgid "Invalid purpose"
 msgstr "Səhv qrqument"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "_Vəsiqə ID:"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "_Vəsiqə ID:"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9039,15 +9234,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, fuzzy, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9065,7 +9260,7 @@ msgstr ""
 "Yenə də qəbul etmək istəyirsiniz?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:690
+#: camel/camel-tcp-stream-ssl.c:833
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9080,35 +9275,35 @@ msgstr ""
 "\n"
 "Yenə də qəbul etmək istəyirsiniz?"
 
-#: camel/camel-tcp-stream-ssl.c:734
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:786
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:804
+#: camel/camel-tcp-stream-ssl.c:947
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "_Vəsiqə ID:"
 
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:964
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr "_Vəsiqə ID:"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' alına bilmir"
@@ -9123,40 +9318,40 @@ msgstr "%s başladırkən xəta oldu"
 msgid "No such message %s in %s"
 msgstr "\"%s\"da(də) %s deye bir ismarış yoxdur"
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Bütün qovluqlarda yeni ePoçt üçün bax"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Qovluq silinə bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Qovluq silinə bilmir: %s: Belə qovluq yoxdur"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Qovluq adı dəyişdirilə bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Qovluq adı dəyişdirilə bilmir: %s: Belə qovluq yoxdur"
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2611
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2614
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verici gözlanilməz şakildə bağlantını kəsdi: %s"
@@ -9179,52 +9374,52 @@ msgstr "IMAP vericisindən gözlənilməz cavab alındı: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "Verci cavabı çox tez sonlandı."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:655
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:691
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP vericisindən gözlənilməz qəbul cavabı alındı: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:221
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s qovluğunu yarada bilmədim: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:240
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s üçün mündəricat yüklənə bilmədi"
 
-#: camel/providers/imap/camel-imap-folder.c:306
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "Qovluq dağıdılıb vericidə yerinə yenisi yaradıldı."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:548
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Dəyişdirilmiş ismarışda dəyişikliklər daranır"
 
-#: camel/providers/imap/camel-imap-folder.c:1872
+#: camel/providers/imap/camel-imap-folder.c:1873
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "İsmarış kodu açıla bilmir."
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9233,24 +9428,24 @@ msgstr ""
 "İSmarıc alına bilmir: %s\n"
 "   %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Belə bir ismarış yoxdur"
 
-#: camel/providers/imap/camel-imap-folder.c:1931
-#: camel/providers/imap/camel-imap-folder.c:2527
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
 msgid "This message is not currently available"
 msgstr "Bu ismarış hazırda mövcuddur"
 
-#: camel/providers/imap/camel-imap-folder.c:2191
-#: camel/providers/imap/camel-imap-folder.c:2261
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
 msgid "Fetching summary information for new messages"
 msgstr "Yeni ismarışların icmalı alınır"
 
-#: camel/providers/imap/camel-imap-folder.c:2565
+#: camel/providers/imap/camel-imap-folder.c:2567
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cavabında ismarış gövdəsi tapıla bilmədi"
 
@@ -9280,7 +9475,7 @@ msgstr "Yeni ePoçt üçün baxılır"
 msgid "Check for new messages in all folders"
 msgstr "Bütün qovluqlarda yeni ePoçt üçün bax"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "Qovluqlar"
 
@@ -9310,7 +9505,7 @@ msgstr "IMAP vericisində məktubların saxlanması və oxuna bilməsi üçün."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Parol"
 
@@ -9329,62 +9524,61 @@ msgstr "%s SMTP vericisi"
 msgid "IMAP service for %s on %s"
 msgstr "%s üstündə %s üçün %s xidmətləri"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr "Bağlantı Ləğv edildi"
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s a(ə) bağlana bilmirəm (qapı %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "İstifadəçi adı göndərilmə xətası oldu: %s"
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Əməliyyat dəstəklənmir"
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Tanıtma bacarılmadı."
 
-#: camel/providers/imap/camel-imap-store.c:1082
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP vericisi %s tanıtma növünü dəstəkləmir"
 
-#: camel/providers/imap/camel-imap-store.c:1092
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s Tanıtma növü dəßtəklənmir"
 
-#: camel/providers/imap/camel-imap-store.c:1116
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sLütfən %s@%s üçün IMAP parolunu girin"
 
-#: camel/providers/imap/camel-imap-store.c:1131
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Parolu girmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:1160
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9395,24 +9589,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1462
-#: camel/providers/imap/camel-imap-store.c:1604
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr "%s deyə bir qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1839
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Qovluq ad Return xarakteri daxil edə bilməz."
 
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1851
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Naməlum xəta: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Əlaqəli qovluğun alt qovluqlara malik olmağına icazə verilməyib"
 
@@ -9488,8 +9682,8 @@ msgid ""
 msgstr "Yerli məktubları mbox tərzi məktub cərgələrində saxlaya bilmək üçün."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s kök saxlama dəqiq bir yol deyildir"
@@ -9501,36 +9695,36 @@ msgstr "%s kök saxlama düzgün bir qovluq deyildir."
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Qovluq alına bilmədi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Yerli saxlamaların gələnlər qutusu qovluğu yoxdur"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s Yeli məktub faylı"
 
-#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "%s faylı %s adi ilə yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "`%s' Qovluq mündəricat faylı silinə bilmir: %s"
 
-#: camel/providers/local/camel-local-store.c:394
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' Qovluq indeks faylı silinə bilmir: %s"
@@ -9540,7 +9734,7 @@ msgstr "`%s' Qovluq indeks faylı silinə bilmir: %s"
 msgid "Could not save summary: %s: %s"
 msgstr "İcmal qeyd edilə bilmir: %s :%s"
 
-#: camel/providers/local/camel-local-summary.c:454
+#: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Xülasəyə ismarış əlavə edə bilmədim: naməlum səbəb"
 
@@ -9553,14 +9747,14 @@ msgstr "Maildir imsarış əlavə edilməsi ləğv edildi"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "İsmarış məktub qovluğu fayllına əlavə edilə bilmir: %s: %s "
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr "Hökmsüz ismarış mövtəviyyatı"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9572,14 +9766,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "`%s' faylı yoxdur ."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:168
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9594,70 +9788,70 @@ msgid "`%s' is not a maildir directory."
 msgstr "`%s' məktub qovluğu faylı deyildir."
 
 #: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-maildir-store.c:205
 #: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' qovluğu silinə bilmir: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr "məktub qovluğu faylı deyildir"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:282
-#: camel/providers/local/camel-spool-store.c:312
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "`%s' qovluğu darana bilmədi: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:416
-#: camel/providers/local/camel-maildir-summary.c:545
+#: camel/providers/local/camel-maildir-summary.c:417
+#: camel/providers/local/camel-maildir-summary.c:548
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Məktub cərgəsi qovluğu cığırı açıla bilmir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Yeni ePoçt üçün baxılır"
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Yeni ismarışlar daranır"
 
-#: camel/providers/local/camel-maildir-summary.c:729
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:583
-#: camel/providers/local/camel-mbox-summary.c:673
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Qovluqlar saxlanılır"
 
-#: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s üstündə qovluq qıfılı yaradıla bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Məktub qutusu açıla bilmir: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "Məktub əlavəsi ləğv edildi"
 
-#: camel/providers/local/camel-mbox-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "İsmarış mbox fayllına əlava edilə bimir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:396
-#: camel/providers/local/camel-mbox-folder.c:404
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9666,11 +9860,11 @@ msgstr ""
 "İsmarış alına bilmir: %s qovluğundan %s\n"
 "   %s"
 
-#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Qovluq geri dönülməz şəkildə xəsarət alıb."
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İSmarıc quruluşu bacarılmadı: Məktub qutusu yoxsa xəsərlidir?"
 
@@ -9713,76 +9907,76 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' qovluğu boş deyildir. Silinmədi."
 
-#: camel/providers/local/camel-mbox-summary.c:350
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Qovluq açıla bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:398
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "%ld yeri yaxınlığında %s qovluğunda ciddi məktub darama xətası"
 
-#: camel/providers/local/camel-mbox-summary.c:453
+#: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Qovluq yoxlana bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:678
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Faylı açıla bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-spool-summary.c:169
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Müvəqqəti məktub qutusu açıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-mbox-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Qaynaq qovluğu bağlana bilmədi: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:621
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Müvəqqəti qovluq bağlana bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:716
-#: camel/providers/local/camel-mbox-summary.c:724
-#: camel/providers/local/camel-mbox-summary.c:913
-#: camel/providers/local/camel-mbox-summary.c:921
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Toplama və qovluq bir birinə uyğun gəlmir, sinxronizasiyadan sonra da əlbətdə"
 
-#: camel/providers/local/camel-mbox-summary.c:848
-#: camel/providers/local/camel-spool-summary.c:332
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Naməlum xəta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:812
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:976
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Müvəqqəti məktub qutusuna yazıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:993
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Müvəqqəti məktub qutusuna yazılma bacarılmadı: %s: %s"
@@ -9801,67 +9995,67 @@ msgstr "mh qovluğuna ismarış əlavə edilə bilmir: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' qovluq deyildir."
 
-#: camel/providers/local/camel-mh-summary.c:243
+#: camel/providers/local/camel-mh-summary.c:244
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH cərgə cığırı açıla bilmir: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Hovuz qovluqları yenidən adlandırıla bilməz"
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "%s kök saxlama düzgün bir qovluq deyildir."
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Qovluq `%s/%s' faylı yoxdur."
 
-#: camel/providers/local/camel-spool-store.c:176
+#: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' normal bir fayl deyildir ."
 
-#: camel/providers/local/camel-spool-store.c:193
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr "%s hovuz məktub faylı"
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Hovuz qovluqları yenidən adlandırıla bilməz"
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Hovuz qovluqları yenidən adlandırıla bilməz"
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Hovuz qovluqları silinə bilməz"
 
-#: camel/providers/local/camel-spool-summary.c:181
-#: camel/providers/local/camel-spool-summary.c:190
-#: camel/providers/local/camel-spool-summary.c:199
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Müvəqqəti məktub faylı %s sinxronlaşdırıla bilmir: %s"
 
-#: camel/providers/local/camel-spool-summary.c:214
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "%s hovuz qovluğu sinxronlaşdırıla bilmir: %s"
 
-#: camel/providers/local/camel-spool-summary.c:244
-#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
 #: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
@@ -9945,45 +10139,45 @@ msgid "Retrieving POP summary"
 msgstr "POP yığcamlaşdırılması alınır"
 
 #: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:427
-#: camel/providers/pop3/camel-pop3-folder.c:486
-#: camel/providers/pop3/camel-pop3-folder.c:503
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
 #, fuzzy
 msgid "User cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
-#: camel/providers/pop3/camel-pop3-folder.c:264
+#: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Qovluq alına bilmədi: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr "Silinmiş ismarışlar açılır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:401
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "%s uid'li ismarış yoxdur"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:408
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP ismarışı alınır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:488
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "İSmarıc alına bilmir: %s\n"
 "   %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Naməlum yağmur"
@@ -10001,7 +10195,7 @@ msgstr "İsmarışları Vericidə burax"
 msgid "Delete after %s day(s)"
 msgstr "%s gün sonra sil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -10028,27 +10222,27 @@ msgstr ""
 "quracaqdır. Bu seçənək bütün vericilər tərəfindən bütün istifadəçilər üçün "
 "dəstəklənməz."
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "%s a(ə) bağlana bilmirəm (qapı %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "İstifadəçi adı göndərilmə xətası oldu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
 msgstr "%s üstündəki POP vericisi ilə ünsiyyət qurula bilmir."
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10057,28 +10251,28 @@ msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "İstənən tanıtma protokoluna dəstək verilmir."
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "KPOP vericisi ilə ünsüyyət qurula bilmir: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sLütfən %s@%s üçün POP3 parolunuzu girin"
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10087,13 +10281,13 @@ msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "Parol göndərmə xətası oldu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:614
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "`%s' deyə bir qovluq yoxdur."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10105,50 +10299,50 @@ msgstr ""
 "Yerli sistemdəki \"sendmail\" proqramı istifadə edilərək məktub göndərmək "
 "üçün."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 #, fuzzy
 msgid "Could not parse recipient list"
 msgstr "URL `%s' alına bilmir"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Sendmailə boru(pipe) çəkilə bilmədi bilmədi. %s: məktub göndərilmədi"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Sendmail çəngəllənə bilmədi: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr "İsmarış göndərilə bilmədi: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail %s siqnalı verərək bağlandı: məktub göndərilə bilmədi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s işə salına bilmir: məktub göndərilə bilmədi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail %d halı ilə bağlandı: məktub göndərilə bilmədi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail proqramı ilə məktub göndərilməsi"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10158,140 +10352,140 @@ msgstr ""
 "SMTP istifadə edilərək uzaq məktub yayıcısına bağlanaraq məktub göndərmək "
 "üçün.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaksis xətası, əmr tanınmır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametr və ya arqumentlərdə sintaksis xətası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Əmr qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Əmr parametri qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Sistem vəziyyəti və ya kömək cavabı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Kömək İsmarışı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Xidmət hazırdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Xidmət nəqliyyat kanallarını bağlayır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Xidmət uyğun deyildir, nəqliyyat kanalları bağlanır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Sorğulanan məktub gedişi müvəffəqiyyətlidir, qurtardı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr "İstifadəçi yerli deyil; <çatdırma cığırı>na çatdırıram"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Sorğulanan məktub gedişi alınmadı; məktub qutusu əl çatmazdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Sorğulanan gediş alınmadı; məktub qutusu əl çatmazdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Sorğulanan gediş ləğv edildi; xəta oldu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr "İstifadəçi yerli deyil; lütfən <çatdırma cığırı>nı sınayın"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Sorğulanan gediş alınmadı; uyğunsuz sistem daxılı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Sorğulanan məktub gediş ləğv edildi; daxıl dolmuşdur"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Sorğulanan gediş alınmadı; məktub qutusu adı qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Məktub alımı başladı; <CRLF>.<CRLF> ilə sonlandırın"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "Nəqliyyat bacarılmadı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "Parol nəqli lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Tanıtma mexanizması çox zəifdir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Sorğulanan tanıtma mexanizması üçün kriptləmək lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Müvəqqəti tanıtma iflası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Tanıtma lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 #, fuzzy
 msgid "Welcome response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "İstifadəçi adı göndərilmə xətası oldu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:342
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Bu ismarış düzgün qurulmuşa oxşamır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "%s SMTP vericisi %s tanıtma növünü dəstəkləmir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sLütfən %s@%s üçün SMTP parolunu girin"
@@ -10321,11 +10515,11 @@ msgstr "%s dan(dən) SMTP məktub göndərilməsi"
 msgid "Cannot send message: sender address not valid."
 msgstr "İsmarış göndrərilə bilmədi: göndərənin ünvanı hökmsüzdür."
 
-#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "İsmarış göndərilir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
 
@@ -10334,63 +10528,63 @@ msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "SMTP Qarşılaması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "RSET istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "SMTP Tanıtma"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "SASL tanıtma cismi yaratma xətası."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "AUTH istək bacarılmadı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Vericidən xətalı tanıtma istəyi alındı.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAİL FROM istək vaxt dolması: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAİL FROM cavablama xətası: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCTP TO istək vaxt dolması: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA istək vaxt dolamsı. %s: məktub göndərilə bilmədi"
@@ -10398,82 +10592,82 @@ msgstr "DATA istək vaxt dolamsı. %s: məktub göndərilə bilmədi"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA göndərmə vaxt dolması: ismarış qurtarılır: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:102
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:113
+#: composer/e-msg-composer-attachment-bar.c:108
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "yapışdırılmış fayl"
 
-#: composer/e-msg-composer-attachment-bar.c:520
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr "Seçili üzvləri yapışdırılmış fayllar siyahısından sil"
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Yapışdırılmış fayl əlavə et ..."
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "İsmarışa bir fayl əlavə et"
 
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Fayl ilişdirmə bacarılmadı: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:177
+#: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "%s faylı ilişdirilə bilmir: sıravı fayl deyildir"
@@ -10491,11 +10685,15 @@ msgid "MIME type:"
 msgstr "MIME növü:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:163
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr "İlişdirilmişin öz-özünə göstərilməyini tövsiyyə et"
 
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr "Ünvan dəftəri üçün buraya tıqla"
 
@@ -10506,45 +10704,45 @@ msgstr "Ünvan dəftəri üçün buraya tıqla"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:400
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Cavab ver"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Göndərən:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Mövzu :"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Gn:"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "İsmarışın göndərildiği adamlar"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:436
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "İsmarışın nüsxəsinin göndəriləcəyi ünvanlar"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:440
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10555,27 +10753,28 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "_Qapı:"
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "izah"
 
-#: composer/e-msg-composer-select-file.c:275
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
 msgstr "Bir fayl yapışdır"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "PGP imza məzmunu yaradıla bilmir."
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10584,34 +10783,30 @@ msgstr ""
 "%s faylı oxunurkən xəta oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "Xəbərdarlıq!"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Fayl mövcuddur, üstünə yazaq?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fayl qeyd edərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fayl yüklərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fayla yetişilirkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Editordan ismarışlar alına bilmir"
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10620,7 +10815,7 @@ msgstr ""
 "Faylda axtarış aparıla bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10629,7 +10824,16 @@ msgstr ""
 "Fayl parçalana bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1285
+#, fuzzy, c-format
+msgid ""
+"Unable to copy file descriptor: %s\n"
+"%s"
+msgstr ""
+"Faylda axtarış aparıla bilmir: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10638,7 +10842,7 @@ msgstr ""
 "İsmarışın öz-özünə qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10646,7 +10850,7 @@ msgstr ""
 "Ximian Evolution əvvəlki iclasdan qalan qeyd edilməmiş fayllar tapdı.\n"
 "Onları indi bərpa etməyə cəhd etməyimi istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10657,28 +10861,33 @@ msgstr ""
 "\n"
 "Dəyişiklikləri qeyd etmak istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1536
+#: composer/e-msg-composer.c:1555
+msgid "_Discard Changes"
+msgstr ""
+
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Xəbərdarlıq: Düzəldilmiş İsmarış"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Faylı aç"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Signature:"
 msgstr "Imzanı qeyd et"
 
-#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "Bir ismarış yaz"
 
-#: composer/e-msg-composer.c:2796
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10686,7 +10895,7 @@ msgstr ""
 "Yazıçı pəncərəsi yaradıla bilmir:\n"
 "Ünvan seçici idarə fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:2822
+#: composer/e-msg-composer.c:2931
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10697,7 +10906,7 @@ msgstr ""
 "Yazıçı pəncərəsi yaradıla bilmir:\n"
 "HTML editor parçası fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10705,25 +10914,12 @@ msgstr ""
 "Yazıçı pəncərəsi yaradıla bilmir:\n"
 "HTML editor parçası fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:3858
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:393
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"Yazıçı pəncərəsini yarada bilmirəm, çünkü siz məktub parçasındakı\n"
-"heç bir qurǧulari, aparmamısınız."
-
-#: composer/evolution-composer.c:408
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "Evolutionun ePoçt yazma parçasını başlada bilmədim ."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Evolution qruplaşdırılmış proqram təminatı otağı"
@@ -10773,8 +10969,111 @@ msgstr "Daxil edən mövzu"
 msgid "Subject does not contain"
 msgstr "Daxil etməyən mövzu"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
-#: mail/mail-display.c:192
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:4
+#, fuzzy
+msgid "<b>Out of Office Message:</b>"
+msgstr "İş Yerində Deyil"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "_Hal:"
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:12
+#, fuzzy
+msgid "Out of Office Assistant"
+msgstr "İş Yerində Deyil"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "Hal"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "ePoçt Alınır"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "ePoçt Göndərilir"
+
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:9
+#, fuzzy
+msgid "Read Receipts"
+msgstr "Alıcılar"
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
+#: e-util/e-component-listener.c:128
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10782,214 +11081,240 @@ msgstr ""
 "Eyni adlı bir fayl onsuz da vardır.\n"
 "Üstünə yazım mı?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Faylının üsütünə yazım mı?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Bu parolu yadda saxla"
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Bu iclas boyunca bu parolu yadda saxla"
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 #, fuzzy
 msgid "Sync Categories:"
 msgstr "Kateqoriyalar"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:171 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:176 e-util/e-time-utils.c:375
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:181
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:186
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:197
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:201
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:206
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:216
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:221
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:325 e-util/e-time-utils.c:424
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:329 e-util/e-time-utils.c:416
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
+#: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
+#: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:342
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:181
-msgid "seconds"
-msgstr "saniyə"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 saniyə"
 
-#: filter/filter-datespec.c:71
-msgid "minute"
-msgstr "dəqiqə"
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d saniyə"
 
-#: filter/filter-datespec.c:72
-msgid "hour"
-msgstr "saat"
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 dəqiqə"
 
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "həftə"
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d dəqiqə"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "həftə"
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 saat"
 
-#: filter/filter-datespec.c:75
-msgid "month"
-msgstr "ay"
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d saat"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 gün"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr " əvvəl"
+
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 həftə"
+
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d həftə"
+
+#: filter/filter-datespec.c:70
+#, fuzzy
+msgid "1 month ago"
 msgstr "ay"
 
-#: filter/filter-datespec.c:76
-msgid "year"
-msgstr "il"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr " əvvəl"
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "il"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
+
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr " əvvəl"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 #, fuzzy
 msgid "You must choose a date."
 msgstr "Vaxsey. Tarix seçməyi unutmusan."
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr "<vaxtı görə bilmək üçün buraya tıqlayın>"
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "indi"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:279
+#: filter/filter-datespec.c:285
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%a %d %b %Y"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
-#, fuzzy, c-format
-msgid "%d %s ago"
-msgstr " əvvəl"
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Müqayisə ediləcək vaxtı seçin"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Süzgəc Qaydaları"
 
-#: filter/filter-file.c:178
+#: filter/filter-file.c:166
 #, fuzzy
-msgid "You must specify a file name"
+msgid "You must specify a file name."
 msgstr "Tərz adı :"
 
-#: filter/filter-file.c:190
+#: filter/filter-file.c:184
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "`%s' normal vir hovuz deyil ya da sıravı bir fayl deyildir"
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 #, fuzzy
 msgid "Choose a file"
 msgstr "Gediş seç:"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "Onda"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "Gediş əlavə et"
-
-#: filter/filter-folder.c:149
+#: filter/filter-folder.c:155
 #, fuzzy
-msgid "You must specify a folder.\n"
+msgid "You must specify a folder."
 msgstr "Tərz adı :"
 
-#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "Qovluq Seçin"
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10998,78 +11323,76 @@ msgstr ""
 "'%s' qaydalı ifadələrdə xəta oldu:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:62
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
 msgid "Important"
 msgstr "Vacib"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133
+#: filter/filter-label.c:122 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 #, fuzzy
 msgid "Work"
 msgstr "İşləyir"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1281
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124
+#: filter/filter-label.c:124 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 #, fuzzy
 msgid "To Do"
 msgstr "Toqo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1283
 #, fuzzy
 msgid "Later"
 msgstr "sonra"
 
-#: filter/filter-part.c:545 shell/evolution-test-component.c:49
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 msgid "Test"
 msgstr "Sınaq"
 
-#: filter/filter-rule.c:223
+#: filter/filter-rule.c:219
 msgid "You must name this filter."
 msgstr "Bu süzgəcə ad verməlisiniz."
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Qayda adı :"
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "Adsız"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Əgər"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "Gedişi işə sal"
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "bütün kriteriyalar uyğun gəlirsə"
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "Kriteriya əlavə et"
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "gələn"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "gedən"
 
@@ -11121,7 +11444,7 @@ msgstr ""
 "Bu ismarış tarixi burada göstərdiyiniz ilə\n"
 "müqayisə ediləcəkdir."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Virtual Qovluqlar"
 
@@ -11133,6 +11456,14 @@ msgstr "indiki vaxta görə müddət"
 msgid "ago"
 msgstr "əvvəl"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "ay"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "saniyə"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "təkcə xüsusi qovluqlar"
@@ -11150,6 +11481,10 @@ msgstr "bildirdiyin vaxt"
 msgid "vFolder Sources"
 msgstr "vFolder Qaynaqları"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "həftə"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "bütün fəal uzaq qovluqlarla"
@@ -11162,6 +11497,10 @@ msgstr "bütün yerli və fəal uzaq qovluqlarla"
 msgid "with all local folders"
 msgstr "bütün yerli qovluqlarla"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "il"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11294,7 +11633,7 @@ msgstr "deyil"
 msgid "is not Flagged"
 msgstr "Bayraqlı"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 msgid "Label"
 msgstr ""
 
@@ -11324,7 +11663,7 @@ msgstr "Əlaqəyə İsmarış Göndər"
 msgid "Play Sound"
 msgstr "Səs çal:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr "Oxu"
 
@@ -11355,12 +11694,12 @@ msgstr "böyükdür"
 msgid "returns less than"
 msgstr "azdır"
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Göndərən"
 
@@ -11397,8 +11736,9 @@ msgstr "başlayır"
 msgid "Stop Processing"
 msgstr "İşi Dayandır"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Mövzu"
 
@@ -11407,68 +11747,84 @@ msgstr "Mövzu"
 msgid "Unset Status"
 msgstr "Hal Seç"
 
-#: filter/rule-editor.c:180
-msgid "Rules"
-msgstr "Qaydalar"
-
-#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
 #, c-format
-msgid "Rule name '%s' is not unique, choose another"
+msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:170
+msgid "Rules"
+msgstr "Qaydalar"
+
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Qayda Əlavə Et"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "Qaydanı Düzəlt"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "Qayda adı :"
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr "Qiymətləndirmə Qaydaları"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "Bu vfolder-ə ad verməlisiniz."
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr "Mənbə olarq ən az bir qovluq bildirməlisiniz."
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "vFolder Qaynaqları"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sizin köhnə Elm məktublarınızı idxal edir"
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr "Alınır..."
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr "Xahiş edirik gözləyin"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr "%s %s olaraq idxal edilir"
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, c-format
 msgid "Scanning %s"
 msgstr "%s daranır"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:353
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
 msgstr "Məktub"
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11476,7 +11832,7 @@ msgstr ""
 "Evolution Elm məktub faylları tapdı.\n"
 "Onları Evolution içinə idxal edək?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11488,12 +11844,12 @@ msgstr ""
 "Evolution GnomeCard faylları tapdı.\n"
 "Onları Evolution içinə idxal edək?"
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Üstünlük: %s"
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11508,7 +11864,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11516,7 +11872,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11525,39 +11881,41 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution köhnə Netscape verilənlərini idxal edir"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
-#: shell/e-local-storage.c:183
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Zibil Qutusu"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "%s Yeli məktub faylı"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr "Qovluq daranır"
 
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "İdxal başlanır"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Qurğular"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Süzgəcləri Düzəlt"
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11565,11 +11923,11 @@ msgstr ""
 "Evolution Netscape  məktub faylları tapdı.\n"
 "Onları Evolution içinə idxal edək?"
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution köhnə Pine verilənlərini idxal edir"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -11577,135 +11935,128 @@ msgstr ""
 "Evolution Pine məktub faylları tapdı.\n"
 "Onları proqramımıza idxal edək?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Evolutionun məktub yazıçısı emalatxanası."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Evolutionun Vəzifə parçası emalatxanası."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Evolutionun məktub yazıçısı emalatxanası."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Evolutionun məktub yazıçısı emalatxanası."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 #, fuzzy
 msgid "Configure the fonts used by Evolution here"
 msgstr "Evolutionun məktub yazıçısı emalatxanası."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
 msgid "Configure your email accounts here"
 msgstr ""
 "Məktub hesabları yaradın və ya təkmilləşdirin, başqa əməliyyatlar aparın"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Məktub taşkilatcısı Evolution parçası."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Evolution mail composer."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolutionun Vəzifə parçası emalatxanası."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
 msgstr "Evolutionun ePoçt yazıçısı."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Evolutionun icracı mündəricat parçası."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolutionun ePoçt yazıçısı."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Evolutionun məktub qovluğu nümayişcisi."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutionun Vəzifə parçası emalatxanası."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Evolutionun məktub qovluğu nümayişcisi emalatxanası."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Poçt quraşdırılma ara üzü"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Evolutionun məktub yazıçısı emalatxanası."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolutionun məktub qovluğu nümayişcisi."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "Məktub Mündəricatı parçası emalatxanası."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Evolutionun Vəzifə parçası emalatxanası."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolutionun icracı mündəricat parçası."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
 msgid "Font Preferences"
 msgstr "Təkrarlama _yoxudr"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Hesablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr "Poçt quraşdırılma ara üzü"
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Məktub daxil edən qovluq"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "Ümumi"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Məktub daxil edən qovluq"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Virtual Zibil"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Virtual Zibil Qovluğu"
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Bu qovluq ismarış daxil edə bilməz."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Xüsusiyyətlər..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Qovluqların seçənəklərini dəyişdir"
 
-#: mail/component-factory.c:805
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11713,285 +12064,283 @@ msgstr ""
 "Bəzi məktub qurğularınız deyəsən xəsarət görüb, xahiş edirik, hər şeyin "
 "yerində olub olmadığını yoxlayın."
 
-#: mail/component-factory.c:970
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Məktub nəql yolunu bildirməmisən"
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:998
-#, fuzzy
-msgid "Warning: Unsent Messages"
-msgstr "Xəbərdarlıq: Düzəldilmiş İsmarış"
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Yeni Məktub İsmarışı"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_Məktub İsmarışı"
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Bir ismarış yaz"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Sonrakı İsmarış"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "Əvvəlki İsmarış"
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Yeni Məktub İsmarışı"
 
-#: mail/component-factory.c:1078
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
-
-#: mail/component-factory.c:1087
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Evolutionun poçt quraşdırma parçasını başlada bilmədim ."
-
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Evolutionun qovluq info parçasını başlada bilmədim ."
-
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
 #, fuzzy
 msgid "Connecting..."
 msgstr "Vericiyə bağlantı qurulur..."
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"in Seçənəkləri"
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Seçənəklər"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d yeni"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr "%d gizli"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr "%d seçili"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d yollanmamış"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "%d yollanmış"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "cəmi %d"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "İsmarışdan _Virtual Qovluq Yarat"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "_Mövzudakı vFolder"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "Gön_dərəndəki vFolder"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "_Alıcıdakı vFolder"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "Məktublaşma Q_rupundakı VFolder"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Mö_vzudakı Süzgəc"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Gön_dərəndəki  Süzgəc"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "_Alıcıdakı Süzgəc"
 
-#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr "_Məktublaşma Qrupundakı Süzgəc"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "Yeni İsmarış olaraq _Düzəlt ..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Ver"
 
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "_Qrupa Cavab Ver"
 
-#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Ver"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Çatdır"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1771
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Bitirmə Tarixi"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Təmizlə"
 
 #. separator here?
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Oxun_muş olaraq İşarələ"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Ox_unmamış olaraq İşarələ"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "_Vacib olaraq İşarələ"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "_Qeyri-Vacib olaraq İşarələ"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Geri Gətir"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Yollayanı Ünvan dəftərinə Əlavə Et"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Süzgəclər Əlavə Et"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "İsmarışdan Qa_yda Yarat"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Məktublaşma Qrupunda Süz (%s)"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "(%s) Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default"
 msgstr "Ə_sas"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Qovluq Məlumatı Alınır"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "'Mbox'u Evolution içinə gətirən emalatxana"
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolutionun ePoçt yazıçısı."
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolutionun ePoçt yazıçısı."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "'Mbox' fayllarını Evolution içinə gətirir"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "'Outlook Express 4' məktublarını Evolution içinə gətirən emalatxana."
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolutionun ePoçt yazıçısı."
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "'Outlook Express 4' fayllarını Evolution içinə gətirir."
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolutionun ePoçt yazıçısı."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12028,100 +12377,100 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr "Lazımi bütün məlumatlar verilməlidir."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:159
+#: mail/mail-account-editor.c:146
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesab Düzəldicisi"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Qovşaq:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "İ_stifadəci Adı:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_Cığır:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Eyni adda və iki hesab yarada bilməzsiniz."
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Silmə"
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "Həqiqətən də hesabı silək?"
-
-#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr "Bağla"
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr "Fəallaşdır"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
+#, fuzzy
+msgid "[Default]"
+msgstr "Ə_sas"
+
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr "Fəal"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Hesab adı:"
 
-#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Riko"
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "%s a(ə) məktub göndər"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Mövzu %s dir(dır)"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Məktub %s dandır(dəndir)"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s məktublaşma qrupu"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr "Süzgəc Qaydası Əlavə Et"
 
-#: mail/mail-autofilter.c:376
+#: mail/mail-autofilter.c:372
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12133,7 +12482,12 @@ msgstr ""
 "    '%s'\n"
 "Və güncəlləndilər."
 
-#: mail/mail-callbacks.c:154
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Bu ismarışı bir də göstərmə."
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -12145,7 +12499,16 @@ msgstr ""
 "bunu quraşdırmalısınız.\n"
 "Bunu indi quraşdırmaq istəyirsiniz?"
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:211
+#, fuzzy
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"ePoçt göndərməkdən əvvəl bir \n"
+"şəxs tanıtmalısan."
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12153,7 +12516,7 @@ msgstr ""
 "ePoçt göndərməkdən əvvəl bir \n"
 "şəxs tanıtmalısan."
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12162,7 +12525,7 @@ msgstr ""
 "nəqliyyatını qurmalısan."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:254
 #, fuzzy
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
@@ -12171,11 +12534,11 @@ msgstr ""
 "HTML şəklində imsarış göndərirsiniz, amma aşağıdakı alıcılar HTML şəklində "
 "məktub istəmirlər:\n"
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Yenə də yollayaq?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12183,7 +12546,7 @@ msgstr ""
 "Bu ismarışın mövzusu yoxdur .\n"
 "Həqiqətən də göndərim?"
 
-#: mail/mail-callbacks.c:356
+#: mail/mail-callbacks.c:313
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -12191,11 +12554,11 @@ msgstr ""
 "Nə vaxta qədər ki, əlaqə siyahınız qrup ünvanıarını gizləyəcək şəkildə "
 "sazlanıb, bi ismarış təkcə Bcc alıcılar daxil edəcək."
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "İsmarış təkcə Bcc alıcıları daxil edir."
 
-#: mail/mail-callbacks.c:364
+#: mail/mail-callbacks.c:322
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -12205,11 +12568,11 @@ msgstr ""
 "məlumatlndırmaq istəsin.\n"
 "Yenə də göndərək?"
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Məktubu göndərə bilmək üçün alıcını da bildirməlisən."
 
-#: mail/mail-callbacks.c:777
+#: mail/mail-callbacks.c:722
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -12217,28 +12580,28 @@ msgstr ""
 "Bu hesab üçün lahiyə cərgəsə açıla bilmədi.\n"
 "Əsas lahiyə cərgəsini işlətmək istəyirsiniz?"
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "naməlum yollayan"
 
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d at %H:%M, tarixidə %%s yazmışdır ki:"
 
-#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "İsmarış(ları) buraya daşı "
 
-#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "İsmarış(ları) buraya köçürt"
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Bütün `%d' ismarışlarını düzəltmək istəyirsiniz?"
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12246,7 +12609,7 @@ msgstr ""
 "Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
 "ismarışları düzəldə bilərsiniz."
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12254,42 +12617,46 @@ msgstr ""
 "Sadəcə olaraq Göndərilən cərgəsinə qeyd edilən\n"
 "ismarışları yeniden gönderebilirsiniz."
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Həqiqətən də bütün `%d' ismarışı yenidən yollamaq istəyirsən?"
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Heç İsmarış Seçilmədi"
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "Faylının üsütünə yazım mı?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"İSmarıc alına bilmir: %s\n"
+"   %s"
+
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s onsuz da mövcuddur.\n"
+"Üstünə yazmaq istəyirsiniz?"
 
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "İsmarışı Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "İsmarışları Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:2655
+#: mail/mail-callbacks.c:2687
 #, fuzzy
-msgid "Go to next folder with unread messages?"
-msgstr "Sonrakı oxunamış ismarışı göstər"
-
-#: mail/mail-callbacks.c:2662
-msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2905
 msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12298,7 +12665,7 @@ msgstr ""
 "\n"
 "İsmarışları həqiqətən də silək?"
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12307,64 +12674,64 @@ msgstr ""
 "Süzgəc məlumatını yükləmə xətası:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Süzgəclər"
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%d İsmarışın %d qədərə alınır"
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "İsmarışı Çap Et"
 
-#: mail/mail-callbacks.c:3156
-msgid "US-Letter"
-msgstr ""
-
-#: mail/mail-callbacks.c:3197
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "İsmarıların çap edilməsi bacarılmadı"
 
-#: mail/mail-callbacks.c:3387
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Bütün %d ismarışlarını başqa pəncərədə açmaq istəyirsiniz?"
 
-#: mail/mail-composer-prefs.c:223
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+#, fuzzy
+msgid "Unnamed"
+msgstr "Adsız Əlaqə"
 
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
+#: mail/mail-composer-prefs.c:335
 #, fuzzy
-msgid " [script]"
-msgstr "izah"
+msgid "You must specify a valid script name."
+msgstr "Tərz adı :"
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
-msgstr ""
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+#, fuzzy
+msgid "[script]"
+msgstr "izah"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
+#: mail/mail-composer-prefs.c:864
 #, fuzzy
-msgid "Unnamed"
-msgstr "Adsız Əlaqə"
+msgid "Language(s)"
+msgstr "Dil"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
 #, fuzzy
 msgid "Add script signature"
 msgstr "Kriteriya əlavə et"
 
-#: mail/mail-composer-prefs.c:876
+#: mail/mail-composer-prefs.c:926
 #, fuzzy
-msgid "Add Signature"
-msgstr "Imzanı qeyd et"
+msgid "Signature(s)"
+msgstr "_HTML Imza:"
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Kimlik"
+
+#: mail/mail-config-druid.c:382
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -12375,7 +12742,12 @@ msgstr ""
 "sahələrin doldurulmağa çox ehtiyacı yoxdur. Əlbətdə yolladığınız məktublarda "
 "bu məlumatların görünməyini istəmirsinizsə."
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "E-poçt Alınır"
+
+#: mail/mail-config-druid.c:390
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -12385,11 +12757,16 @@ msgstr ""
 "sistem idarəçinizə, ya da İnternet Xidmət\n"
 "vericinizə müraciət edin."
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Xaniş edirik, aşağıdakı seçənəklər arasından seçin"
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "E-poçt Göndərilir"
+
+#: mail/mail-config-druid.c:402
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -12399,7 +12776,11 @@ msgstr ""
 "deyilsinizsə, sistem idarəçinizə, ya da\n"
 "İnternet Xidmət Vericinizə müraciət edinu."
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Hesab İdarəsi"
+
+#: mail/mail-config-druid.c:409
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -12415,156 +12796,139 @@ msgstr ""
 "aşağıdakı boşluğa bir ad girin.\n"
 "Bu ad təkcə ekranda göstərilmək məqsədilə işlədiləcəkdir."
 
-#. set window title
-#: mail/mail-config-druid.c:637
-msgid "Evolution Account Assistant"
-msgstr "Evolution Hesab Yardımçısı"
-
-#: mail/mail-config.c:622
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "Hesab"
-
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Xidmət Yoxlanılır"
 
-#: mail/mail-config.c:2394 mail/mail-config.c:2398
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "Vericiyə bağlantı qurulur..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr " Dəstəklənən növləri _yoxla "
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Kriplənmiş məktub göndərdiyin vaxt məktubu _həmişə mənim üçün kriptlə"
 
-#: mail/mail-config.glade.h:5
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr ""
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Account Editor"
 msgstr "Hesab %d"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Hesab Haqqında"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Hesab İdarəsi"
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Kriteriya əlavə et"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Imzanı qeyd et"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Kriplənmiş məktub göndərdiyin vaxt məktubu _həmişə mənim üçün kriptlə"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Bu hesabı işlədərək göndərdiyin bütün məktubları həmişə _imzala"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "İsmarışa bir fayl əlavə et"
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Yapışdırılmış fayl"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Tanıtma"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Yeni Məktubları _avtomatik yoxla"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Naməlum hərf dəstəsi: %s"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "C_olors"
 msgstr "_Qapat"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Yeni Məktubları Yoxla"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Bugünkü vəzifə rəngi"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Bir ismarış yaz"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Quraşdırma"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
+#, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
 "Təbrüklər, məktub qurğularınız qurtardı.\n"
 "\n"
@@ -12573,306 +12937,303 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Qurtar\"a basın."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Ə_sas"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Əsas"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Əsas dil kodlaması:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Poçt Alınır"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr "Digital ID-lər..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "İsmarış açıla bilmir"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Qurtardı"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Lahiyələr qovluğu:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "Fə_allaşdır"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Emacs"
 msgstr "Şərq"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Daxil edən ePoçt"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "ePoçt Ünvanı: "
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Çıxışda zibil qutularını _boşalt"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Evolution Hesab Yardımçısı"
+
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Gedişi işə sal"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "sonlanır"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Font Properties"
 msgstr "Seçənəklər"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Çatdırılmış ismarış"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "Digital ID Al..."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Sitatları belə _Rəngləndir"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Kimlik"
-
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Daxili"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Qeyd Et və Qapat"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "_Rəsmləri Yüklə"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "ePoçt Quraşdırılması"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Məktub qutusu yeri"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "İsmarış Başlığı"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "_İsmarış Ekranı"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Daxil edən ismarış"
+
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikroneziya"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "ePoçt Quraşdırılması"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "On Screen fonts"
-msgstr ""
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Arzuya Bağlı Məlumatlar"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Orqanizasiya:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _Açar ID:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Rəng al"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Təkcə _Bcc alıcıları bildirlən ismarış yollamağa çalışdığımda bildir"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Seçili əlaqələri çap et"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Qmail cərgəsi "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quote original message"
 msgstr "İsmarış açıla bilmir"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Sitatlandırılmış"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "Bu parolu _yadda saxla"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Cavab ver"
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "ePoçt Alınır"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Alma Seçənəkləri"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Bu parolu yadda saxla"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "İstənən Məlumatlar"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Əsas"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Təhlükəsizlik"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Etibarlı MIME"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "ePoçt Göndərilir"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Göndərilən _ismarışlar qovluğu:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Göndərilən və Lahiyə İsmarışları"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Veri_ci tanıtmaya ehtiyac hiss edər"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Verici Quraşdırılması"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "Verici _Növü: "
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Qısa Yollar"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Tərz adı :"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr ""
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
@@ -12907,10 +13268,11 @@ msgid "V_ariable-width:"
 msgstr "Dəyişən"
 
 #: mail/mail-config.glade.h:129
+#, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 "\"Evolution\" Məktub Quraşdırılması Vasitəsinə Xoş Gəldiniz.\n"
 "\n"
@@ -12985,120 +13347,125 @@ msgid "_Enable"
 msgstr "Fəallaşdır"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Fərqli Çatdır"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Tam Ad:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML məktubda"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "Yollayan ünvan dəftərində varsa, rəsmləri _yüklə"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Bunu ə_sas hesab olaraq göstər"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "İsmarışları bundan sonra \"Oxundu\" olaraq _işarələ: "
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "Netdə olmayan rəsmləri he_ç bir vaxt yükləmə"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Əlaqələrə HTML məktubları göndərəndə bu tərzu istəməyənlər varsa xəbər ver"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Boş mövzu qisimli məktub göndərdiyim vaxt bildir"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "E-poçt Alınır"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Hamısına cavab ver"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Script:"
 msgstr "_Təhlükəsizlik"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "E-poçt Göndərilir"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Vaxt Fərqli Göstər"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML Imza:"
 
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "San Marino"
+
 #: mail/mail-config.glade.h:175
 #, fuzzy
-msgid "_Use secure connection (SSL):"
-msgstr "E_tibarlı bağlantı (SSL) işlət"
+msgid "_Terminal Font:"
+msgstr "Əsl Əlaqə:"
 
 #: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Variable-width:"
-msgstr "Dəyişən"
+msgid "_Use secure connection (SSL):"
+msgstr "E_tibarlı bağlantı (SSL) işlət"
 
 #: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "_hər"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "color"
 msgstr " rəng"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "izah"
 
@@ -13122,188 +13489,190 @@ msgstr "S/MIME zərf məzmunu yaradıla bilmir."
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME kod açma məzmunu yaradıla bilmir."
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Eyni adlı bir fayl onsuz da vardır.\n"
+"Üstünə yazım mı?"
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Yapışdırılmış Faylı Qeyd Et"
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Yapışdırılmış Faylı Qeyd Et"
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "İçərisini Göstər"
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "%s da(də) Aç ..."
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "İçərisini Göstər (%s ilə)"
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Gizlə"
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Xarici Göstərici"
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
 #, fuzzy
 msgid "Downloading images"
 msgstr "_Rəsmləri Yüklə"
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "İsmarış içindəkilər yüklənir"
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
 #, fuzzy
 msgid "Overdue:"
 msgstr "Ge_cikmiş işlər:"
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Körpünü Səyyahda Aç"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Körpü Ünvanınə Köçür"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Körpünü Fərqli qeyd et"
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Rəsmi Fərqli qeyd et..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "%s daranır"
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "%s yapışdırılmış fayl"
 
-#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
-#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ismarışı açıla bilmədi: Mənbə kodu gösteriliyor."
 
-#: mail/mail-format.c:783 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarix"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Səhv Ünvan"
 
-#: mail/mail-format.c:913 mail/message-list.etspec.h:7
-#: mail/message-tags.glade.h:3
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Göndərən"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Cavablama"
 
-#: mail/mail-format.c:922 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Gn:"
 
-#: mail/mail-format.c:927
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:932
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:963
-#, fuzzy
-msgid "Mailer"
-msgstr ""
-"\n"
-"Göndərici:  "
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Bu ismarış digital olaraq imzalanmışdır. Ətraflı məlumat üçün qıfıl "
 "timsalına tıqla."
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "PGP təsdiq məzmunu yaradıla bilmir."
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Bu ismarış digital olaraq imzalanmışdır və original olduğu düşünülür."
 
-#: mail/mail-format.c:1892
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Bu ismarış digital olaraq imzalanmışdır amma original olduğu düşünülmür."
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP saytını göstərən ox (%s)"
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Yerli faylyi göstərən (%s) oxu \"%s\" saytında hökmlüdür"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerli faylyi göstərən ox (%s)"
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Uzaq verilənlər (%s) nişanı"
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Naməlum xarici məlumatı göstərən ox (\"%s\" növündə "
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Xəsərli xarici proqram parçası."
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Yerli Qovluqlar"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Qovluq yenidən qurulur"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:748
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13312,12 +13681,12 @@ msgstr ""
 "Qovluğun meta məlumatını qeyd eda bilmədim; Bu qovluğu bir də aça\n"
 "bilməyə bilərsən: %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "%s üstündə meta verilənlər qeyd edilə bilmir: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Qovluq meta verilənləri %s silinə bilmir: %s"
@@ -13327,7 +13696,7 @@ msgstr "Qovluq meta verilənləri %s silinə bilmir: %s"
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" qovluğu \"%s\" şəklinə çevrilir"
 
-#: mail/mail-local.c:1351
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13335,12 +13704,12 @@ msgstr ""
 "Bu qovluğu bir də aça bilməsən, onu əllə\n"
 "bərpa etməlisən."
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "%s i(ı) Yenidən Quraşdır"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr "Yerli olmayan qovluqların şəklini dəyişdirə bilməzsiniz."
 
@@ -13362,108 +13731,108 @@ msgstr ""
 "Əməliyyat aparılırkən xəta oldu:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "İşləyir"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Qovluq Süzülür"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Poçt Alınır"
 
-#: mail/mail-ops.c:553 mail/mail-ops.c:582
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
 msgstr "Axırı ki, ismarış müvəffəqiyyətlə yollandı."
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" Göndərilir"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarış göndərilir"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d ismarışda xəta"
 
-#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
 msgid "Complete."
 msgstr "Qurtadı."
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "İsmarışlar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarışlar \"%s\"a(ə) daşınır"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İsmarışlar \"%s\"a(ə) köçürülür"
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" dakı qovluqlar daranır"
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Çatdırılmış ismarış"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "%s qaynağı açılır"
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s qovluğu çıxardılır"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Qovluq yenilənir"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "Qovluq açılır"
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarışı alınır"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d ismarış alınır"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d ismarış qeyd edilir"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13472,7 +13841,7 @@ msgstr ""
 "Nəticə faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13481,11 +13850,11 @@ msgstr ""
 "İsmarışların buraya qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Yapışdırılmış Fayl Qeyd Edilir"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13494,54 +13863,54 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Data yazıla bilmədi: %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ilə bağlantı kəsilir"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "A_xtar"
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Adsız İsmarış)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Adsız İsmarış"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Boş İsmarış"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "İsmarışda Axtar"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "Axtar"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Böyük Kiçik Hərfə Həssas"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "İrəliyə Axtar"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Axtar:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Oxşayır:"
 
@@ -13549,69 +13918,65 @@ msgstr "Oxşayır:"
 msgid "Cancelling..."
 msgstr "Ləğv Edilir ..."
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Verici: %s, Növ: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Cığır: %s, Növ: %s"
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr "Növ: %s"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr "Poçt Göndər və Al"
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "Hamısını Ləğv Et"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "Güncəllənir ..."
 
-#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
 msgid "Waiting..."
 msgstr "Gözləyir..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "İstifadəçi əməliyyatı ləğv etdi."
 
-#: mail/mail-session.c:272
-msgid "_Remember this password"
-msgstr "Bu parolu _yadda saxla"
-
-#: mail/mail-session.c:273
-#, fuzzy
-msgid "_Remember this password for the remainder of this session"
-msgstr "Bu iclas boyunca bu parolu yadda saxla"
-
-#: mail/mail-session.c:330
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s üçün Parol girin"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Parol Girin"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:280
+msgid "_Remember this password"
+msgstr "Bu parolu _yadda saxla"
+
+#: mail/mail-session.c:281
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Bu iclas boyunca bu parolu yadda saxla"
+
+#: mail/mail-signature-editor.c:80
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "İmza faylı qeyd edilə bilmir."
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "Imzanı qeyd et"
-
-#: mail/mail-signature-editor.c:181
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13621,44 +13986,52 @@ msgstr ""
 "\n"
 "Dəyişikliklərinizin qeyd edilməyini istəyirsinizmi?"
 
-#: mail/mail-signature-editor.c:333
+#: mail/mail-signature-editor.c:229
+msgid "_Discard changes"
+msgstr ""
+
+#: mail/mail-signature-editor.c:233
+msgid "Save signature"
+msgstr "Imzanı qeyd et"
+
+#: mail/mail-signature-editor.c:389
 #, fuzzy
 msgid "Edit signature"
 msgstr "Kriteriya əlavə et"
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:429
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML Imza:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Ad :"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Çatdırılmış ismarış - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Çatdırılmış ismarış"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Çatdırılmış İsmarış"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "vfolder qurulur: %s"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Uri üçün vfolder məlumatı güncəllənir: %s"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13671,98 +14044,98 @@ msgstr ""
 "    '%s'\n"
 "Və güncəlləndilər."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VFolderlər"
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 #, fuzzy
 msgid "vFolders"
 msgstr "Qovluqlar"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "VFolder-i Düzəlt"
 
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Mövcud olmayan '%s' vfolder-i düzəldilməyə çalışılır."
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Yeni VFolder"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Mövzusuz)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - İsmarış"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "Görülməmiş"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "Görülmüş"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Cavab cerilmiş"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "Çoxlu Görülməmiş İsmarış"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "Çoxlu İsmarış"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "Ən Alçaq"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "Alçalt"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "Yüksək"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "Ən Yüksək"
 
-#: mail/message-list.c:1066
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Sabah: %l:%M %p"
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2568
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "İsmarış siyahısı yaradılır"
 
@@ -13797,47 +14170,47 @@ msgstr "Alındı"
 msgid "Size"
 msgstr "Böyüklük"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
 msgstr "Geri axtarma"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "İrəli get"
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:64
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:65
 #, fuzzy
 msgid "For Your Information"
 msgstr "Mənbə Məlumatı"
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Çatdır"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Cavab ver"
 
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Hamısına cavab ver"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 #, fuzzy
 msgid "Review"
 msgstr "Nümayiş"
 
-#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13867,53 +14240,44 @@ msgstr "Aidiyyət"
 msgid "_Flag:"
 msgstr "Fayl adı:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "%s altındakı qovluqlar daranır (\"%s\" üstündəki)"
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "\"%s\" üstündəki kök səviyyəsi qovluqlar daranır"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "\"%s\" qovluğuna qeydiyyat aparılır"
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" qovluğuna qeydiyyat silinir"
 
-#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Qovluq"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "_Qovluqda qeyd et ..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Heç verici seçilməyib"
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Verici seçin."
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "All folders"
-msgstr "Bütün qovluqlar"
-
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "Aprel"
-
 #: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -13924,66 +14288,47 @@ msgid "Close"
 msgstr "Qapat"
 
 #: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Display Options"
-msgstr "Göstərmə seçənəkləri"
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr "Belə başlayan ada malik qovluqlar:"
-
-#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr "Üzvlükləri Düzəlt"
 
-#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Siyahını Yenilə"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Qovluq Seçin"
 
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "Fayl seç"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Qeydiyyatdan Keç"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "Qeydiyyatdan _Çıx"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for the Evolution Summary."
-msgstr "Evolution İcmalını daxil edən qovluqlar"
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Evolution İcmalını daxil edən qovluqlar"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Summary component."
+msgid "Evolution Summary"
 msgstr "Evolutionun ePoçt yazıçısı."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
 #, fuzzy
-msgid "Factory for Evolution Summary's configuration control."
-msgstr "Evolutionun Vəzifə parçası emalatxanası."
+msgid "Evolution Summary component"
+msgstr "Evolutionun ePoçt yazıçısı."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
 #, fuzzy
-msgid "Factory for the Evolution Summary component."
-msgstr "Məktub Mündəricatı parçası emalatxanası."
+msgid "Evolution Summary configuration control"
+msgstr "Evolutionun Vəzifə parçası emalatxanası."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 #, fuzzy
 msgid "Summary Preferences"
 msgstr "İcmam Qurğuları"
@@ -17782,7 +18127,7 @@ msgid "Hagerstown"
 msgstr ""
 
 #. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
 msgid "Hail"
 msgstr "Dolu"
 
@@ -19625,6517 +19970,6507 @@ msgid "Marion-Wytheville"
 msgstr ""
 
 #: my-evolution/Locations.h:1325
-#, fuzzy
-msgid "Marquette"
-msgstr "Martiniq"
-
-#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 #, fuzzy
 msgid "Marshall"
 msgstr "Marşal Adaları"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshalltown"
 msgstr "Marşal Adaları"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 #, fuzzy
 msgid "Marte"
 msgstr "Martiniq"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Ox_unmamış olaraq İşarələ"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Martiniq"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsville"
 msgstr "Martiniq"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Maryland"
 msgstr "İrlandiya"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 #, fuzzy
 msgid "Masirah"
 msgstr "Malayziya"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 #, fuzzy
 msgid "Massena"
 msgstr "Makedoniya"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Matamoros"
 msgstr "Komor"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 #, fuzzy
 msgid "Mattoon"
 msgstr "İda"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mayaguez"
 msgstr "İdarəci"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayport"
 msgstr "Mayot"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Qazaxıstan"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazu"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 #, fuzzy
 msgid "McCall"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCarthy"
 msgstr "Mart"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McClellan"
 msgstr "İslandiya"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McComb"
 msgstr "Şir"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 #, fuzzy
 msgid "Meacham"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Medford"
 msgstr "əvvəl"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 #, fuzzy
 msgid "Mehamn"
 msgstr "İda"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 #, fuzzy
 msgid "Melfa"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 #, fuzzy
 msgid "Mendoza"
 msgstr "Makedoniya"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 #, fuzzy
 msgid "Merida"
 msgstr "Cümə"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 #, fuzzy
 msgid "Merril Field"
 msgstr "_Göndərən Girişi"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 #, fuzzy
 msgid "Mexicali"
 msgstr "Meksika"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 #, fuzzy
 msgid "Miami"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 #, fuzzy
 msgid "Middle East"
 msgstr "_Orta ad:"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middleton Island"
 msgstr "Solomon Adaları"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middletown"
 msgstr "_Orta ad:"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Midland"
 msgstr "Finlandiya"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 #, fuzzy
 msgid "Miles City"
 msgstr "Fayl növü:"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Milford"
 msgstr "üçün"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 #, fuzzy
 msgid "Milton"
 msgstr "%s a(ə) məktub göndər"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 #, fuzzy
 msgid "Minatitlan"
 msgstr "Mavritaniya"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minchumina"
 msgstr "gələn"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 #, fuzzy
 msgid "Minnesota"
 msgstr "Mikroneziya"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 #, fuzzy
 msgid "Minot"
 msgstr "deyil"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 #, fuzzy
 msgid "Missoula"
 msgstr "Miss"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missouri"
 msgstr "Miss"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Mitchell"
 msgstr "Oxşayır:"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitilini"
 msgstr "Məktublaşma qrupu"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 #, fuzzy
 msgid "Moa"
 msgstr "B.ei"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "Əl Telefonu"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 #, fuzzy
 msgid "Mobridge"
 msgstr "Əl Telefonu"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Modesto"
 msgstr "Orta çən"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 #, fuzzy
 msgid "Mojave"
 msgstr "Daşı"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Molde"
 msgstr "Əl Telefonu"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Moldova"
 msgstr "Bazar ertəsi"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 #, fuzzy
 msgid "Molokai"
 msgstr "Malavi"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 #, fuzzy
 msgid "Monclova"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Moncton"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Monida"
 msgstr "Bazar ertəsi"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 #, fuzzy
 msgid "Monroe"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Montague"
 msgstr "İdarəci"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montana"
 msgstr "Botsvana"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "Orta qar yadışı"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Aylıq Nümayiş"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Montego Bay"
 msgstr "Monqolustan"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 #, fuzzy
 msgid "Monterey"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterrey"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 #, fuzzy
 msgid "Montgomery"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 #, fuzzy
 msgid "Monticello"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Montpelier"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 #, fuzzy
 msgid "Montrose"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 #, fuzzy
 msgid "Morelia"
 msgstr "Monqolustan"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morgantown"
 msgstr "Quruluş"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Moriarty"
 msgstr "İlk"
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 #, fuzzy
 msgid "Mosinee"
 msgstr "Əl Telefonu"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 #, fuzzy
 msgid "Mountain View"
 msgstr "Aylıq Nümayiş"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "Cənubi Şərq"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Aylıq Nümayiş"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 #, fuzzy
 msgid "Mullan"
 msgstr "İda"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 #, fuzzy
 msgid "Muncie"
 msgstr "İyun"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 #, fuzzy
 msgid "Murcia"
 msgstr "Mavritaniya"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 #, fuzzy
 msgid "Mus"
 msgstr "Məs"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Muscatine"
 msgstr "Martiniq"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 #, fuzzy
 msgid "Mykonos"
 msgstr "knots"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 #, fuzzy
 msgid "Najran"
 msgstr "Bahreyn"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 #, fuzzy
 msgid "Namsos"
 msgstr "Ad"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 #, fuzzy
 msgid "Nanning"
 msgstr "Xəbərdarlıq"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 #, fuzzy
 msgid "Napa"
 msgstr "Yaponiya"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Naples"
 msgstr "Ad"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Napoli"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Narvik"
 msgstr "ULəqəb"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 #, fuzzy
 msgid "Natal"
 msgstr "İtaliya"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natchez"
 msgstr "Oxşayır:"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 #, fuzzy
 msgid "Nebraska"
 msgstr "Yeni Vəzifə"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 #, fuzzy
 msgid "Nenana"
 msgstr "Qrenada"
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 #, fuzzy
 msgid "Nevada"
 msgstr "Qrenada"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Newark"
 msgstr "Yeni Vəzifə"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "New Bedford"
 msgstr "Yeni Bəsləmə"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bern"
 msgstr "Yeni Zellandiya"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 #, fuzzy
 msgid "Newcastle"
 msgstr "Xəbərlər"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Yeni Zellandiya"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Yeni Zellandiya"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 #, fuzzy
 msgid "New Haven"
 msgstr "Yeni Kaledoniya"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Iberia"
 msgstr "Yeni Kaledoniya"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Jersey"
 msgstr "Yeni İsmarış"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Mexico"
 msgstr "Meksika"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Orleans"
 msgstr "Hollandiya"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 #, fuzzy
 msgid "Newport"
 msgstr "Şimal"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 #, fuzzy
 msgid "New River"
 msgstr "Yeni VFolder"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 #, fuzzy
 msgid "Newton"
 msgstr "Yeni"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "New York"
 msgstr "Yeni VFolder"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "Ölçülər :"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nipawin"
 msgstr "İspaniya"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nis"
 msgstr "dir(dır)"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 #, fuzzy
 msgid "Nogales"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nome"
 msgstr "Ad"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Norfolk"
 msgstr "Norfolk Adaları"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 #, fuzzy
 msgid "Norfolk NAS"
 msgstr "Norfolk Adaları"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 #, fuzzy
 msgid "Norrkoping"
 msgstr "İşləyir"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "North Adams"
 msgstr "Şimali Şərq"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Bend"
 msgstr "Şimal"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 #, fuzzy
 msgid "North Conway"
 msgstr "Norveç"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Dakota"
 msgstr "Şimali Şərq"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 #, fuzzy
 msgid "North Platte"
 msgstr "Şimali Şərq"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "Northway"
 msgstr "Norveç"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "Cənubi Fransız Sahələri"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norwich"
 msgstr "Şimal"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwood"
 msgstr "Norveç"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Notodden"
 msgstr "Qeyd"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "Başlamayıb"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 #, fuzzy
 msgid "Oakland"
 msgstr "Tayland"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Yamayka"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 #, fuzzy
 msgid "Ocala"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Oceanside"
 msgstr "İslandiya"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Odense"
 msgstr "Bir"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Oelwen"
 msgstr "Aç"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Ogden"
 msgstr "Aç"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 #, fuzzy
 msgid "Ohrid"
 msgstr "Başqa"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 #, fuzzy
 msgid "Ojika Island"
 msgstr "Kuku Adaları"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "Britaniya Virgin Adaları"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Olathe"
 msgstr "Başqa"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 #, fuzzy
 msgid "Olbia"
 msgstr "Albaniya"
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 #, fuzzy
 msgid "Omaha"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 #, fuzzy
 msgid "Omak"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Omsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 #, fuzzy
 msgid "Ontario"
 msgstr "İstiqamət"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Oostende"
 msgstr "Ziyarətçilər"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oran"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 #, fuzzy
 msgid "Orange"
 msgstr "Qur"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 #, fuzzy
 msgid "Oregon"
 msgstr "Qur"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 #, fuzzy
 msgid "Orland"
 msgstr "İrlandiya"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orlando"
 msgstr "İrlandiya"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 #, fuzzy
 msgid "Oruro"
 msgstr "Xəta"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 #, fuzzy
 msgid "Oscoda"
 msgstr "saniyə"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 #, fuzzy
 msgid "Ostrava"
 msgstr "Avstraliya"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 #, fuzzy
 msgid "Owyhee"
 msgstr "həftə"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Oxford"
 msgstr "üçün"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 #, fuzzy
 msgid "Paganella"
 msgstr "Səhifə"
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 #, fuzzy
 msgid "Palacios"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 #, fuzzy
 msgid "Palermo"
 msgstr "Peycer"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 #, fuzzy
 msgid "Palmdale"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 #, fuzzy
 msgid "Palmer"
 msgstr "Peycer"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palm Springs"
 msgstr "Məktub Qurğuları"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 #, fuzzy
 msgid "Pamplona"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 #, fuzzy
 msgid "Panama City"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Ləğv Edildi"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Papa"
 msgstr "Yaponiya"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Paphos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 #, fuzzy
 msgid "Paris"
 msgstr "İlk"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "Qismi çisələmə"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 #, fuzzy
 msgid "Pasco"
 msgstr "Parol"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 #, fuzzy
 msgid "Patna"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 #, fuzzy
 msgid "Paysandu"
 msgstr "Ağır qum"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Payson"
 msgstr "Səs çal:"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Pellston"
 msgstr "Sual"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pelotas"
 msgstr "Yenilə"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pendleton"
 msgstr "Seçki : "
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 #, fuzzy
 msgid "Peoria"
 msgstr "Gürcüstan"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 #, fuzzy
 msgid "Perm"
 msgstr "İlk"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 #, fuzzy
 msgid "Perth"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 #, fuzzy
 msgid "Perugia"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 #, fuzzy
 msgid "Philip"
 msgstr "Filippin"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Filippin"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Phillips"
 msgstr "Filippin"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 #, fuzzy
 msgid "Pierre"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 #, fuzzy
 msgid "Pikeville"
 msgstr "Nümayiş"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 #, fuzzy
 msgid "Pisa"
 msgstr "Pakistan"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 #, fuzzy
 msgid "Plymouth"
 msgstr "ay"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 #, fuzzy
 msgid "Podgorica Titograd"
 msgstr "Qismi tornado"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 #, fuzzy
 msgid "Point Hope"
 msgstr "Zərfi Çap Et"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Lay"
 msgstr "İcmalı Çap Et"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Mugu"
 msgstr "İsmarışı Çap Et"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 #, fuzzy
 msgid "Poitiers"
 msgstr "Seçənəklər"
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 #, fuzzy
 msgid "Ponca City"
 msgstr "Telefon Siyahısı"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponce"
 msgstr "Yoxdur"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 #, fuzzy
 msgid "Pontiac"
 msgstr "Əlaqələr"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 #, fuzzy
 msgid "Poprad"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Təqvimi çap et"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 #, fuzzy
 msgid "Port Angeles"
 msgstr "Zərfi Çap Et"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 #, fuzzy
 msgid "Porterville"
 msgstr "Nümayiş"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Kartı çap et"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 #, fuzzy
 msgid "Portland"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Porto"
 msgstr "_Qapı:"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "Gedişat"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 #, fuzzy
 msgid "Portoroz"
 msgstr "Portret"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Portret"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 #, fuzzy
 msgid "Port Said"
 msgstr "Portret"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 #, fuzzy
 msgid "Posadas"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 #, fuzzy
 msgid "Poza Rica"
 msgstr "Kosta Rika"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poznan"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Praha"
 msgstr "Paraqvay"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "Qismi çisələmə"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Çap Etmə nümayişi"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 #, fuzzy
 msgid "Pretoria"
 msgstr "Gürcüstan"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Preveza"
 msgstr "Nümayiş"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Price-Carbon"
 msgstr "Pitkairn"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Pristina"
 msgstr "Ənənəvi"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Providence"
 msgstr "_Vilayət"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Provincetown"
 msgstr "Nümayiş"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provo"
 msgstr "Məs"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 #, fuzzy
 msgid "Pucallpa"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 #, fuzzy
 msgid "Puebla"
 msgstr "Ümumi"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Pueblo"
 msgstr "Ümumi"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Puerto Barrios"
 msgstr "Porto Riko"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 #, fuzzy
 msgid "Puerto Escondido"
 msgstr "Porto Riko"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "Porto Riko"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Porto Riko"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Maldonado"
 msgstr "Qismi tornado"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "Porto Riko"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "Porto Riko"
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "İcmalı Çap Et"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 #, fuzzy
 msgid "Pula"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pullman"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Təqvimi çap et"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 #, fuzzy
 msgid "Quantico"
 msgstr "Sual"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quebec"
 msgstr "Mövzu"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 #, fuzzy
 msgid "Rapid City"
 msgstr "Cavab verilən"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 #, fuzzy
 msgid "Rawlins"
 msgstr "Yağış "
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Reading"
 msgstr "Başlıqlar"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Rebun Island"
 msgstr "Buvet Adası"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Recife"
 msgstr "Alındı"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 #, fuzzy
 msgid "Redding"
 msgstr "Başlıqlar"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redig"
 msgstr "Oxu"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redmond"
 msgstr "Xatırladıcı"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 #, fuzzy
 msgid "Regina"
 msgstr "Bölgələr"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 #, fuzzy
 msgid "Rennes"
 msgstr "Xatırladıcılar"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Reno"
 msgstr "Reyunion"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Renton"
 msgstr "Reyunion"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 #, fuzzy
 msgid "Reus"
 msgstr "Qaydalar"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reyes"
 msgstr "il"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 #, fuzzy
 msgid "Reynosa"
 msgstr "Yenilə"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Finlandiya"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhode Island"
 msgstr "Buvet Adası"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Riberalta"
 msgstr "Gibraltar"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "Ləqəb"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rieti"
 msgstr "Haiti"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rifle"
 msgstr "Rolu"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rijeka"
 msgstr "Oxu"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rimini"
 msgstr "Ruminıya"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
 #, fuzzy
 msgid "Rioja"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "Nikaraqua"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "Britaniya Virgin Adaları"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
 #, fuzzy
 msgid "Rivera"
 msgstr "Liberiya"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
 #, fuzzy
 msgid "Rivne"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Riyadh"
 msgstr "Oxu"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
 #, fuzzy
 msgid "Roatan"
 msgstr "Xırvatıstan"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Robore"
 msgstr "əvvəl"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
 #, fuzzy
 msgid "Rockland"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
 #, fuzzy
 msgid "Rodos"
 msgstr "Otaq"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rogers"
 msgstr "Qovluqlar"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "Ruminıya"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
 #, fuzzy
 msgid "Roros"
 msgstr "Komor"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
 #, fuzzy
 msgid "Rosario"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
 #, fuzzy
 msgid "Roseglen"
 msgstr "Rolu"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Rost"
 msgstr "Qovşaq"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "Təkrarlama"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 #, fuzzy
 msgid "Russia"
 msgstr "Avstriya"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Rutland"
 msgstr "Butan"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
 #, fuzzy
 msgid "Sacramento"
 msgstr "Bölmə"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
 #, fuzzy
 msgid "Saginaw"
 msgstr "İspaniya"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
 #, fuzzy
 msgid "Saint Paul"
 msgstr "Müqəddəs Lusiya"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saiq"
 msgstr "İspaniya"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Salalah"
 msgstr "Kir"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Salem"
 msgstr "Qeyd Et"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salida"
 msgstr "Somali"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
 #, fuzzy
 msgid "Salina"
 msgstr "Somali"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salinas"
 msgstr "Somali"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
 #, fuzzy
 msgid "Salmon"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
 #, fuzzy
 msgid "Salta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
 #, fuzzy
 msgid "Salto"
 msgstr "_Şn"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
 #, fuzzy
 msgid "Salvador"
 msgstr "Elsalvador"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
 #, fuzzy
 msgid "Samara"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samos"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samsun"
 msgstr "Ba_z"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Sana'A"
 msgstr "Qum"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
 #, fuzzy
 msgid "San Angelo"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
 #, fuzzy
 msgid "San Carlos"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "Sandane"
 msgstr "Qum"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandberg"
 msgstr "Göndərən"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sanderson"
 msgstr "Göndərən"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "San Diego"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
 #, fuzzy
 msgid "Sand Point"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
 #, fuzzy
 msgid "Sanford"
 msgstr "Qum"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "San Francisco"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 #, fuzzy
 msgid "Sangju"
 msgstr "Kölgələmə"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
 #, fuzzy
 msgid "San Joaquin"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Jose"
 msgstr "Qeyd Et və Qapat"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
 #, fuzzy
 msgid "San Juan"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "Somali"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
 #, fuzzy
 msgid "San Miguel"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 #, fuzzy
 msgid "San Nicholas Island"
 msgstr "Norfolk Adaları"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 #, fuzzy
 msgid "San Salvador"
 msgstr "Elsalvador"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 #, fuzzy
 msgid "San Sebastian"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
 #, fuzzy
 msgid "Santa Ana"
 msgstr "Müqəddəs Lusiya"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
 #, fuzzy
 msgid "Santa Maria"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
 #, fuzzy
 msgid "Santa Monica"
 msgstr "Müqəddəs Lusiya"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santander"
 msgstr "Göndərən"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santarem"
 msgstr "Qum fırtınası"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
 #, fuzzy
 msgid "Santiago"
 msgstr "Müqəddəs Lusiya"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
 #, fuzzy
 msgid "Santorini"
 msgstr "Qum fırtınası"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santos"
 msgstr "Hal"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
 #, fuzzy
 msgid "Sao Luiz"
 msgstr "Müqəddəs Lusiya"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
 #, fuzzy
 msgid "Sarasota"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
 #, fuzzy
 msgid "Sarzana"
 msgstr "Şri Lanka"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
 #, fuzzy
 msgid "Sayun"
 msgstr "Ba_z"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Scatsta"
 msgstr "Hal"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
 #, fuzzy
 msgid "Scranton"
 msgstr "Quruluş"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "Qurğular"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Sedalia"
 msgstr "Somali"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Seeb"
 msgstr "Görülmüş"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "İdxal başlanır"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
 #, fuzzy
 msgid "Seward"
 msgstr "Axtar"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
 #, fuzzy
 msgid "Shanghai"
 msgstr "Kölgələmə"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
 #, fuzzy
 msgid "Sharjah"
 msgstr "Axtar"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
 #, fuzzy
 msgid "Sharurah"
 msgstr "Şənbə"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Shawbury"
 msgstr "Şənbə"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shearwater"
 msgstr "Başlama Tarixi"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
 #, fuzzy
 msgid "Sheldon"
 msgstr "İsveç"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
 #, fuzzy
 msgid "Shelton"
 msgstr "Seçki : "
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
 #, fuzzy
 msgid "Sheridan"
 msgstr "Sudan"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
 #, fuzzy
 msgid "Shiraz"
 msgstr "Böyüklük"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
 #, fuzzy
 msgid "Shoreham"
 msgstr "Xal"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Show Low"
 msgstr "Alçaq qar yağışı"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
 #, fuzzy
 msgid "Sidney"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
 #, fuzzy
 msgid "Silver City"
 msgstr "Təhlükəsizlik"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
 #, fuzzy
 msgid "Skive"
 msgstr "Böyüklük"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skopje"
 msgstr "Dayan"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skwentna"
 msgstr "Göndərilənlər"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Slana"
 msgstr "Albaniya"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 #, fuzzy
 msgid "Smithers"
 msgstr "dəqiqə"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
 #, fuzzy
 msgid "Snowshoe Lake"
 msgstr "Qar yağışları"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Sochi"
 msgstr "Cənub"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Socorro"
 msgstr "Xal"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socotra"
 msgstr "Xal"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Soda Springs"
 msgstr "Qar dənələri"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 #, fuzzy
 msgid "Sofia"
 msgstr "Somali"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Soldotna"
 msgstr "Sloveniya"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Somerset"
 msgstr "Yağış"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Göndərən"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
 #, fuzzy
 msgid "Southampton"
 msgstr "Cənubi Şərq"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "South Bend"
 msgstr "Cənub"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Carolina"
 msgstr "Cənubi Afrika"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Dakota"
 msgstr "Cənubi Şərq"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "Southend"
 msgstr "Cənub"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "Marşal Adaları"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
 #, fuzzy
 msgid "Spencer"
 msgstr "Göndərən"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
 #, fuzzy
 msgid "Split"
 msgstr "siyahı"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Spokane"
 msgstr "İspaniya"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
 #, fuzzy
 msgid "Springfield"
 msgstr "Bəsitləşdirilmiş"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
 #, fuzzy
 msgid "State College"
 msgstr "Bitirmə Tarixi:"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "Stauning"
 msgstr "Başlayır:"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
 #, fuzzy
 msgid "Staverton"
 msgstr "Başlayır:"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Stavropol"
 msgstr "Dayan"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
 #, fuzzy
 msgid "Stephenville"
 msgstr "Seyşel"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "St. George"
 msgstr "Müqəddəs Helena"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
 #, fuzzy
 msgid "St Joseph"
 msgstr "Dayan"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Louis"
 msgstr "Müqəddəs Lusiya"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Şri Lanka"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Stornoway"
 msgstr "Norveç"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "St Paul"
 msgstr "Hal"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "Solomon Adaları"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "Şənbə"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
 #, fuzzy
 msgid "Sucre"
 msgstr "Xal"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Lüksemburq"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumter"
 msgstr "Mündəricat"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
 #, fuzzy
 msgid "Sutton"
 msgstr "Ba_z"
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Ənənəvi"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 #, fuzzy
 msgid "Tabuk"
 msgstr "Vəzifə"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
 #, fuzzy
 msgid "Tacna"
 msgstr "Qana"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
 #, fuzzy
 msgid "Taejon"
 msgstr "Onda"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
 #, fuzzy
 msgid "Taif"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Tainan"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiz"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Tajima"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
 #, fuzzy
 msgid "Tallinn"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
 #, fuzzy
 msgid "Tampa"
 msgstr "Yaponiya"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
 #, fuzzy
 msgid "Tampere"
 msgstr "Kağız"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
 #, fuzzy
 msgid "Tanana"
 msgstr "Kanada"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
 #, fuzzy
 msgid "Taos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
 #, fuzzy
 msgid "Taranto"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Tarbes"
 msgstr "Vəzifə"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarija"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
 #, fuzzy
 msgid "Tatalina"
 msgstr "Ənənəvi"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
 #, fuzzy
 msgid "Tela"
 msgstr "Tokelo"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Temple"
 msgstr "Teleks"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
 #, fuzzy
 msgid "Texas"
 msgstr "Vəzifə"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "The Dalles"
 msgstr "Seyşel"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
 #, fuzzy
 msgid "Thisted"
 msgstr "Başlıq"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
 #, fuzzy
 msgid "Thumrait"
 msgstr "Cümə Axşamı"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Tianjin"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tijuana"
 msgstr "Litvaniya"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
 #, fuzzy
 msgid "Tirana"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tiree"
 msgstr "Boş"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
 #, fuzzy
 msgid "Titusville"
 msgstr "Başlıq"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Tivat"
 msgstr "Şəxsi"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 #, fuzzy
 msgid "Tokunoshima Island"
 msgstr "Kristmas Adası"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
 #, fuzzy
 msgid "Toledo"
 msgstr "Gizlə/Göstər"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 #, fuzzy
 msgid "Toluca"
 msgstr "Tokelo"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 #, fuzzy
 msgid "Tonopah"
 msgstr "Tonqa"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Topeka"
 msgstr "Tokelo"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
 #, fuzzy
 msgid "Toronto"
 msgstr "Tornado"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
 #, fuzzy
 msgid "Torp"
 msgstr "Üst :"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torrance"
 msgstr "Fransa"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torreon"
 msgstr "Koreyaca"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "İdxal başlanır"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Toulouse"
 msgstr "Qapat"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
 #, fuzzy
 msgid "Trabzon"
 msgstr "Qabon"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trapani"
 msgstr "Yaponiya"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
 #, fuzzy
 msgid "Trelew"
 msgstr "Teleks"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trenton"
 msgstr "İstiqamət"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trevico"
 msgstr "Əvvəlki"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
 #, fuzzy
 msgid "Trieste"
 msgstr "Sınaq"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 #, fuzzy
 msgid "Trinidad"
 msgstr "Tornado"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
 #, fuzzy
 msgid "Truckee"
 msgstr "Türkiyə"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
 #, fuzzy
 msgid "Tulcea"
 msgstr "Çərşənbə axşamı"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulsa"
 msgstr "Tunis"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tupelo"
 msgstr "Ça_x"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Turaif"
 msgstr "Türkçə"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turin"
 msgstr "Türkçə"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 #, fuzzy
 msgid "Turku"
 msgstr "Türkiyə"
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
 #, fuzzy
 msgid "Twenthe"
 msgstr "Girişimli"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
 #, fuzzy
 msgid "Tyler"
 msgstr "Növ"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
 #, fuzzy
 msgid "Tyumen"
 msgstr "Ça_x"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "Birləşmiş Ərəb Əmirlikləri"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 #, fuzzy
 msgid "Unst"
 msgstr "Görülməmiş"
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
 #, fuzzy
 msgid "Uruapan"
 msgstr "Yaponiya"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Uruqvay"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
 #, fuzzy
 msgid "Utah"
 msgstr "."
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 #, fuzzy
 msgid "Vadso"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Dəyişən"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vagar"
 msgstr "Peycer"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 #, fuzzy
 msgid "Valdosta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
 #, fuzzy
 msgid "Valencia"
 msgstr "Sloveniya"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valentine"
 msgstr "İçərisini Göstər"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
 #, fuzzy
 msgid "Van"
 msgstr "İda"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 #, fuzzy
 msgid "Vandel"
 msgstr "Ləğv Et"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
 #, fuzzy
 msgid "Varadero"
 msgstr "Barbados"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
 #, fuzzy
 msgid "Varna"
 msgstr "Vanuatu"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Vasteras"
 msgstr "sonra"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
 #, fuzzy
 msgid "Venezia"
 msgstr "Venezuela"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 #, fuzzy
 msgid "Venice"
 msgstr "Yunikod"
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 #, fuzzy
 msgid "Vermont"
 msgstr "ay"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vernal"
 msgstr "Ümumi"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
 #, fuzzy
 msgid "Vicenza"
 msgstr "Venezuela"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
 #, fuzzy
 msgid "Vilhena"
 msgstr "Fayl adı:"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
 #, fuzzy
 msgid "Visalia"
 msgstr "Avstraliya"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
 #, fuzzy
 msgid "Vlieland"
 msgstr "Finlandiya"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 #, fuzzy
 msgid "Volkel"
 msgstr "Tokelo"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volk Field"
 msgstr "_Göndərən Girişi"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
 #, fuzzy
 msgid "Voslau"
 msgstr "Tokelo"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 #, fuzzy
 msgid "Waco"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
 #, fuzzy
 msgid "Wallops Island"
 msgstr "Folkland Adaları"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
 #, fuzzy
 msgid "Warner Robins"
 msgstr "Xəbərdarlıq"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 #, fuzzy
 msgid "Waterbury"
 msgstr "Hava"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterloo"
 msgstr "Hava"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Watertown"
 msgstr "Hava"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Waterville"
 msgstr "Kateqoriyalar"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 #, fuzzy
 msgid "Wausau"
 msgstr "Vanuatu"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
 #, fuzzy
 msgid "Webster City"
 msgstr "Web Səhifəsi"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Wejh"
 msgstr "Çə"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Hava"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wendover"
 msgstr "Göndərən"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
 #, fuzzy
 msgid "West Burke"
 msgstr "Qərbi Avropa"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "Westerland"
 msgstr "Hollandiya"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westfield"
 msgstr "Qərb"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
 #, fuzzy
 msgid "Wheeling"
 msgstr "Vaxtlaşdırılır"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "Kristmas Adası"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
 #, fuzzy
 msgid "Wick"
 msgstr "ULəqəb"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wien"
 msgstr "Çə"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
 #, fuzzy
 msgid "Williston"
 msgstr "siyahı"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 #, fuzzy
 msgid "Winchester"
 msgstr "Lixtenşteyn"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 #, fuzzy
 msgid "Windsor"
 msgstr "Qum fırtınası"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 #, fuzzy
 msgid "Winslow"
 msgstr "indi"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
 #, fuzzy
 msgid "Winter Park"
 msgstr "Parol Girin"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
 #, fuzzy
 msgid "Wisconsin"
 msgstr "Mikroneziya"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
 #, fuzzy
 msgid "Wise"
 msgstr "Çə"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "Honq Konq"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Wooster"
 msgstr "Axırıncı :"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Worcester"
 msgstr "həmişə"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worland"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worthington"
 msgstr "İşləyir"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
 #, fuzzy
 msgid "Wyoming"
 msgstr "İşləyir"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Xiamen"
 msgstr "Ad"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
 #, fuzzy
 msgid "Yao Airport"
 msgstr "İdxal etmə"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
 #, fuzzy
 msgid "Yenbo"
 msgstr "Yəmən"
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
 #, fuzzy
 msgid "Zadar"
 msgstr "Təqvim"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zagreb"
 msgstr "Səhifə"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
 #, fuzzy
 msgid "Zanesville"
 msgstr "Ləğv Edildi"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zaragoza"
 msgstr "Paraqvay"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
 #, fuzzy
 msgid "Zurich"
 msgstr "Türkçə"
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr "Evolution İcmalını daxil edən qovluqlar"
 
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "Görüşlər"
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Görüş yoxdur"
 
-#: my-evolution/e-summary-calendar.c:418
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:420
-msgid "%l:%M %d %B"
+#: my-evolution/e-summary-calendar.c:407
+#, fuzzy
+msgid "%l:%M%P %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:438
+#: my-evolution/e-summary-calendar.c:425
 #, fuzzy
 msgid "No description"
 msgstr "izah"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Poçt icmalı"
 
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1102
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Yerli Qovluqlar"
 
-#. translators: Put a list of codes for locations you want to see in
-#. My Evolution by default here. You can find the list of all
-#. stations and their codes in Evolution sources.
-#. (evolution/my-evolution/Locations)
-#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:591
-msgid "KBOS"
-msgstr "KBOS"
-
-#: my-evolution/e-summary-preferences.c:584
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Word of the Day"
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr "Günün Sitatları"
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Xəbər əlavə et"
 
-#: my-evolution/e-summary-preferences.c:848
+#: my-evolution/e-summary-preferences.c:621
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Əlavə etmək istədiyiniz xəbərlərin URL-sini girin"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "RDF endirmə xətası"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Yeni Bəsləmə"
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 #, fuzzy
 msgid "Add"
 msgstr "Ə_lavə Et"
 
-#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Yağış"
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Vəzifə yoxdur"
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(İzahsız)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr "Mənim Hava Vəziyyətim"
 
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Hava"
 
-#: my-evolution/e-summary.c:188
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:584
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 #, fuzzy
 msgid "Please wait..."
 msgstr "Xahiş edirik gözləyin"
 
-#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "İcmalı Çap Et"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "İcmal Çapı bacarılmadı"
 
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "İcraçı icmal qismi Bonobo-nu hazırlaya bilmədi.\n"
-
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 #, fuzzy
 msgid " F"
 msgstr "F"
 
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 #, fuzzy
 msgid " C"
 msgstr "C"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 #, fuzzy
 msgid "knots"
 msgstr "knots"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr "kph"
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "inHg"
 msgstr "inHg"
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "mmHg"
 msgstr "mmHg"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 #, fuzzy
 msgid "miles"
 msgstr "mil"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr "kilometr"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "Təmizlə"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr "Parçalı buludlu"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "Qarışıq buludlu"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "Az buludlu"
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr "Buludlu"
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
 msgid "Invalid"
 msgstr "Hökmsüz"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "Dəyişən"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "Şimal"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "Şimal - Şimali Şərq"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "Şimali Şərq"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "Şərq - Şimali Şərq"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "Şərq"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "Şərq - Cənubi Şərq"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "Cənubi Şərq"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "Cənub - Cənubi Şərq"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "Cənub"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "Cənub - Cənubi Qərb"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "Cənubi Qərb"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "Qərb - Cənubi Qərb"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "Qərb"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "Qərb - Şimali Qərb"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "Şimali Qərb"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "Şimal - Şimali Qərb"
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr "Çisələmə"
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr "Yaxın çevrədə çisələmə var"
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr "Yüngül çisələmə"
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr "Orta çisələmə"
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr "Ağır çisələmə"
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr "Alçaq çisələmə"
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr "Çisələmə izləri vardır"
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr "Qismi çisələmə"
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "İldırımlı Fırtına"
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr "Küləkli çisələmə"
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr "Yağış"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr "Sürüşgən çisələmə"
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr "Şaxtalı çisələmə"
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "Yağış "
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr "Çevrədə yağış var"
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr "Yüngül yağış"
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr "Orta yağış"
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr "Şıdırğı Yağış"
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr "Alçaq yağış"
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr "Yağışın izləri var"
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr "Qismi yağış var"
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr "Küləkli yağış"
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr "Leysan"
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr "Sürüşgən yağış"
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr "Şaxtalı yağış"
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "Qar"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr "Çevrədə qar var"
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr "Yüngül qar yağışı"
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr "Orta qar yadışı"
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr "Ağır qar yağışı"
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr "Alçaq qar yağışı"
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr "Qar yağışının izləri var"
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr "Qismi qar yağışı"
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Qar fırtınası"
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr "Küləkli qar fırtınası"
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr "Qar yağışları"
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr "Sürüşgən qar"
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr "Şaxta"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr "Qar dənələri"
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr "Çevrədə qar dənələri var"
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr "Yüngül qar dənələri var"
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr "Orta qar dənələri var"
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr "Ağır qar dənələri"
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr "Alçaq qar dənələri"
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr "Qar dənələrinin izləri var"
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr "Qismi qar dənələri"
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr "Küləkli qar dənələri"
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr "Qar dənələri yağışı"
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr "Sürüşgən qar dənələri"
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr "Şaxtalı qar dənələri"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr "Buz"
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr "Çevrədə buz var"
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr "Az buz"
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr "Orta buz"
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr "Ağır buz"
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr "Buzun izləri var"
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr "Qismən buz"
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr "Buz fırtınası"
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr "Küləkli buzlanma"
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr "Buzlu yağışı"
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr "Sürüşgən buzlanma"
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr "Şaxta və buzlanma"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr "Buz dənəcikləri"
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr "Çevrədə buz dənəcikləri var"
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr "Az buz dənəcəkləri"
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr "Orta buz dənəcəkləri"
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr "Ağır buz dənəcəkləri"
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr "Alçaq buz dənəcəkləri"
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr "Buz dənəcəklərinin izləri var"
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr "Qismən buz dənəcəkləri"
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr "Buz dənəcəkləri fırtınası"
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr "Küləkli buz dənəcəkləri"
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr "Buz dənəcəkləri yağışı"
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr "Sürüşgən buz dənəcəkləri"
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr "Şaxta və buz dənəcəkləri"
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr "Çevrədə dolu yağışı var"
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "Yüngül dolu yağışı"
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr "Orta dolu yağışı"
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr "Ağır dolu yağışı"
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr "Alçaq dolu yağışı"
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr "Dolu yağışının izləri var"
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr "Qismi dolu yağışı"
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr "Dolu fırtınası"
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr "Küləkli dolu yağışı"
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr "Dolu yağışı"
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr "Sürüşgən dolu yağışı"
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr "Şaxtalı dolu yağışı"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr "Kiçik dolu dənələri"
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr "Çevrədə kiçik dolu dənələri"
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr "Orta kiçik dolu dənələri"
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr "Ağır kiçik dolu dənələri"
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr "Alçaq kiçik dolu dənələri"
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr "Kiçik dolu dənələrinin izləri var"
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr "Qismi kiçik dolu dənələri"
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr "Kiçik dolu dənələri fırtınası"
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr "Küləkli kiçik dolu dənələri"
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr "Kiçik dolu dənələri yağışı"
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr "Sürüşgən kiçik dolu dənələri"
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr "Dondurucu kiçik dolu dənələriu"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr "Naməlum yağmur"
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr "Çevrədə yağış var"
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr "Yüngül yağış"
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr "Orta yağış"
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr "Ağır yağış"
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr "Alçaq yağış"
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr "Yağışın izləri var"
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr "Qismi yağış"
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr "Naməlum leysan yağış"
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr "Küləkli yağış"
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr "Naməlum növdə yağış"
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr "Sürüşgən yağış"
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr "Şaxtalı yağış"
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr "Çən"
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr "Çevrədə çən var"
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr "Yüngül çən"
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr "Orta çən"
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr "Sıx çən"
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr "Seyrək çən"
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr "Çən izləri var"
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr "Qismi çən"
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr "Küləkli çən"
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr "Sürüşgən çən"
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr "Şaxtalı çən"
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr "Çən"
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr "Çevrədə çən var"
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr "Yüngül çən"
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr "Orta çən"
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr "Qalın çən"
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr "Alçaq çən"
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr "Çənin izləri var"
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr "Qismi çən var"
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr "Küləkli çən"
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr "Sürüşgən çən"
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr "Şaxtalı çən"
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr "Duman"
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr "Çevrədə duman var"
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr "Incə duman"
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr "Orta duman"
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr "Qalın duman"
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr "Alçaq duman"
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr "Duman izləri var"
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr "Qismi duman"
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr "Gur duman"
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr "Küləkli duman"
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr "Sürüşgən dumanlı"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr "Vulkan külü"
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr "Çevrədə vulkanik kül var"
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr "Orta vulkanik kül"
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr "Qalın vulkanik kül"
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr "Alçaq vulkanik kül"
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr "uVulkanik külün izləri var"
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr "Qismi vulkanik kül"
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
 msgstr "Gürləyən vulkanık kül"
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr "Küləkli vulkanik kül"
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 msgid "Showers of volcanic ash"
 msgstr "Hamısını Göstər"
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr "Sürüşgən vulkanik kül"
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr "Dondurucu vulkanik kül"
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr "Qum"
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr "Çevrədə qum var"
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr "Yüngül qum"
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr "Orta qum"
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr "Ağır qum"
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr "Qumun izləri var"
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr "Qismi qum"
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr "Küləkli qum"
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr "Sürüşgən qum"
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr "Yüngül pus"
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr "Çevrədə yüngül pus var"
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr "Yüngül pus"
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr "Orta pus"
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr "Qalın pus"
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr "Alçaq pus"
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr "Pusun izləri var"
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr "Qismi pus"
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr "Küləkli pus"
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr "Sürüşgən pus"
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr "Dondurucu pus"
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 msgid "Spray"
 msgstr "Çisələmə"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 msgid "Spray in the vicinity"
 msgstr "Çevrədə çisələmə var"
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 msgid "Light spray"
 msgstr "Yüngül çisələmə"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 msgid "Moderate spray"
 msgstr "Orta çisələmə"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 msgid "Heavy spray"
 msgstr "Ağır çisələmə"
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 msgid "Shallow spray"
 msgstr "Alçaq çisələmə"
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
 msgstr "Çisələmə izləri var"
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 msgid "Partial spray"
 msgstr "Qismi çisələmə"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
 msgstr "Köləkli çisələmə"
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
 msgstr "Sürüklənən çisələmə"
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 msgid "Freezing spray"
 msgstr "Dondurucu çisələmə"
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr "Toz"
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr "Çevrədə toz var"
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr "Yüngül toz"
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr "Orta toz"
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr "Ağır toz"
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr "Tozun izləri var"
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr "Qismi toz"
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr "Küləkli toz"
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr "Sürüşgən toz"
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr "Kir"
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr "Çevrədə kir var"
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr "Yüngül kir"
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr "Orta kir"
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr "Ağır kir"
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr "Qismi kir"
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr "Fırtınalı kir"
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr "Küləkli kir"
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr "Sürüşgən kir"
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr "Dondurucu kir"
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr "Qum fırtınası"
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr "Çevrədə qum fırtınası var"
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr "Yüngül qum fırtınası"
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr "Orta qum fırtınası"
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr "Ağır qum fırtınası"
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr "Alçaq qum fırtınası"
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr "Qismi qum fırtınası"
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr "Leysan yağışlı qum fırtınası"
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr "Küləkli qum fırtınası"
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr "Sürüşgən qum fırtınası"
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr "Dondurucu qum fırtınası"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr "Toz fırtınası"
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr "Çevrədə toz fırtınası var"
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr "Yüngül toz fırtınası"
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr "Orta toz fırtınası"
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr "Ağır toz fırtınası"
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr "Alçaq toz fırtınası"
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr "Qismi toz fırtınası"
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr "Leysan yağışlı toz fırtınası"
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr "Küləkli toz fırtınası"
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr "Sürüşgən toz fırtınası"
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr "Dondurucu toz fırtınası"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr "Parçalı buludlu"
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr "Çevrədə parçalı buludlu var"
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr "Yüngül parçalı buludlu"
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr "Orta parçalı buludlu"
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr "Qalın parçalı buludlu"
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr "Alçaq parçalı buludlu"
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr "Parçalı buludların izləri var"
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr "Qismi parçalı buludlu"
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr "Küləkli parçalı buludlu"
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr "Sürüşgən parçalı buludlu"
 
 #. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
+#: my-evolution/metar.c:443 my-evolution/metar.c:452
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:443
+#: my-evolution/metar.c:444
 msgid "Tornado in the vicinity"
 msgstr "Çevrədə tornado var"
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr "Orta dərəcədə bir tornado"
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr "Qasıb qovuran tornado"
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr "Qismi tornado"
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr "Leysan və göygurultulu tornado"
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr "Sürüşgən tornado"
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr "Dondurucu tornado"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr "Toz qasırğaları"
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr "Çevrədə toz qasırğaları var"
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr "Yüngül toz qasırğaları"
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr "Orta toz qasırğaları"
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr "Ağır toz qasırğaları"
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr "Alçaq toz qasırğaları"
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr "Toz qasırğalarının izləri var"
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr "Qismi toz qasırğaları"
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr "Ağır küləkli toz qasırğaları"
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr "Sürüşgən toz qasırğaları"
 
@@ -26233,33 +26568,34 @@ msgstr "_Vaxtlaşdır"
 msgid "_Weather"
 msgstr "_Hava"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for Evolution folder settings."
-msgstr "Evolutionun məktub yazıçısı emalatxanası."
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution qabığı."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Evolutionun Vəzifə parçası emalatxanası."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 #, fuzzy
 msgid "Folder Settings"
 msgstr "Qurğular"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "Evolution qabığı."
-
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Təfsilatı Göstər"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "Əməliyyatı Ləğv Et"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -26268,58 +26604,40 @@ msgstr ""
 "Qovluğu daşıya bilmirəm:\n"
 "%s"
 
-#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, fuzzy, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "%s da(də) Aç ..."
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 #, fuzzy
 msgid "Add a Folder"
 msgstr "Qovluq Seçin"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Drafts"
 msgstr "Lahiyə"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
-#: shell/e-shortcuts.c:1055
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Gələnlər qutusu"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Gedənlər qutusu"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 #, fuzzy
 msgid "Sent"
 msgstr "Görülmüş"
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "Evolution qurulması"
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Evolutionun bu yeni qurulmasının şəxsi Evolution qovluğuna\n"
-"bə'zi əlavə fayllar köçürməlidir"
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Lütfən \"Oldu\"'ya tıqlayıb, faylları qurun, ya da \"Ləğv Et\"ə basaraq "
-"çıxın."
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Fayllar düzgün güncəllənə bilmədi"
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -26330,7 +26648,7 @@ msgstr ""
 "\n"
 "Xəta : %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -26339,33 +26657,7 @@ msgstr ""
 "`%s' işinə fayllar köçürülürkən xəta\n"
 "baş verdi."
 
-#: shell/e-setup.c:282
-#, fuzzy, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"%s qovluğunu yarada bilmədim:\n"
-"%s"
-
-#: shell/e-setup.c:300
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:306
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:329
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -26376,21 +26668,7 @@ msgstr ""
 "\"Evolution\" istifadəçi fayllarınin qurulması\n"
 "üçün onu sil."
 
-#: shell/e-setup.c:343
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-"Evolution köhnə İcraçı İcmal\n"
-"cərgəsi tapdı.\n"
-"Evolution icra edilmədən əvəəl\n"
-"bunlar silinməlidir.\n"
-"Bu qovluğu silmək istəyirsiniz?"
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -26405,27 +26683,27 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Sizə gətirən"
 
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
 msgstr "Qurtarma Vaxtı"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "Xüsusi Cərgələr"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
 msgstr "Xüsusi Cərgələr"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "Xüsusi Cərgələr"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 #, fuzzy
 msgid "Autocompletion Folders"
 msgstr "Qurtarma Vaxtı"
@@ -26435,44 +26713,44 @@ msgstr "Qurtarma Vaxtı"
 msgid "Cannot copy folder: %s"
 msgstr "Qovluq yoxlana bilmir: %s: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, fuzzy, c-format
 msgid "Cannot move folder: %s"
 msgstr ""
 "Qovluaq adı dəyişdirilə bilmir:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Qovluq öz üstünə daşına bilməz."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Qovluq öz üstünə köçürülə bilməz."
 
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:204
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Qovluq içindəkilərdən birinə daçına bilməz."
 
-#: shell/e-shell-folder-commands.c:321
+#: shell/e-shell-folder-commands.c:319
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "\"%s\" qovluğunun köçürələcəyi qovluğu bildir:"
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Qovluğu köçürt"
 
-#: shell/e-shell-folder-commands.c:365
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "\"%s\" qovluğunun daşınacağı qovluğu bildir:"
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Qovluğu daşı"
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -26481,19 +26759,19 @@ msgstr ""
 "Qovluq silinə bilmir:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
-#, c-format
-msgid "Delete \"%s\""
-msgstr "\"%s\"-i Sil"
-
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr ""
 "Qovluq silinə bilmir:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "\"%s\"-i Sil"
+
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -26502,26 +26780,26 @@ msgstr ""
 "Qovluaq adı dəyişdirilə bilmir:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "%s qovluğu adını buna dəyişdir:"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Qovluğun adını dəyişdir"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:165
+#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-creation-dialog.c:170
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Bildirilən qovluq adı hökmlü deyildir: %s"
 
-#: shell/e-shell-folder-commands.c:586
+#: shell/e-shell-folder-commands.c:583
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:586
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -26530,7 +26808,7 @@ msgstr ""
 "Qovluaq adı dəyişdirilə bilmir:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:122
+#: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -26539,24 +26817,20 @@ msgstr ""
 "Bildirilən qovluq yaradıla bilmədi:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Yeni _Qovluq Yarat..."
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "Yeni ..."
-
-#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "( Adsız )"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr "İcra ediləcək idxalçı növlərinis seçin:"
 
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -26570,11 +26844,11 @@ msgstr ""
 "Əgər təsəvvürünüz yoxdursa \"Avtomatik\" seçənəyini seçin, \"Evolution\" özü "
 "bildiyi kimi edər."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Xahiş edirik, idxal edəcəyiniz məlumatı seçin:"
 
-#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26583,23 +26857,23 @@ msgstr ""
 "%s Alınır\n"
 "%d üzvü alınır."
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "Qovluq Seçin"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' faylı yoxdur"
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:552
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:504
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -26608,11 +26882,11 @@ msgstr ""
 "İş görəcək alıcı mövcud deyildir\n"
 "%s"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Alınır"
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26621,17 +26895,17 @@ msgstr ""
 "%s Alınır.\n"
 "%s Başladılır"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "%s başladırkən xəta oldu"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "%s yüklənərkən xəta oldu"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26640,31 +26914,31 @@ msgstr ""
 "%s Alınır\n"
 "Alınan üzv 1."
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Fayl adı:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Fayl seç"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Fayl növü:"
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Köhnə proqramlardakı verilən və qurğuları idxal et"
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Tək fayl idxal et"
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -26672,32 +26946,32 @@ msgstr ""
 "Xahiş edirik gözləyin...\n"
 "Mövcud qurğular axtarılır"
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Ağıllı İdxalçılar Başladılır"
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Göndərən %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Qovluq seçin"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Bu verilənin idxal ediləcəyi hədəf qovluğu seçin"
 
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Al"
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Bağlantılar qapadılır..."
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, fuzzy, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -26706,158 +26980,160 @@ msgstr ""
 "'%s' sırasında xəta:\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 #, fuzzy
 msgid "Syncing Folder"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:317
+#: shell/e-shell-offline-sync.c:311
 #, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:345
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution Alarmı"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:357
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+#, fuzzy
+msgid "Please select a user."
+msgstr "Verici seçin."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 #, fuzzy
 msgid "Opening Folder"
 msgstr "%s qovluğu açılır"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "%s qovluğu açılır"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "%s da(də) Aç ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:455
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Qovluq yenidən adlandırıla bilmir: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:513
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
 "Bildirilən qovluq yaradıla bilmədi:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:159
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Evolutionun ePoçt Yardımçısı ara üzü başladıla bilmir\n"
-"(%s)"
-
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Evolutionun ePoçt Yardımçısı ara üzü başladıla bilmir\n"
-
-#: shell/e-shell-user-creatable-items-handler.c:579
-#: shell/e-shell-user-creatable-items-handler.c:633
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:636
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr "Yeni"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Qovluq adı bildirilməyib."
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Qovluq ad Return xarakteri daxil edə bilməz."
 
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
-msgstr "Qovluq adı keski daxil edə bilməz."
+#: shell/e-shell-utils.c:129
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Qovluq ad Return xarakteri daxil edə bilməz."
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Qovluq ad Return xarakteri daxil edə bilməz."
+
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' və '..' saxlanmış qovluq adlarıdır."
 
-#: shell/e-shell-view-menu.c:94
+#: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vasitəlri deyəsən sistemə qurulu deyil."
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr "%s icra xətası."
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug-buddy $PATH yolunda tapıla bilmədi."
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "\"Bug-buddy\" işə salına bilmədi."
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "\"Bug-buddy\" işə salına bilmədi."
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution Haqqında"
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "Qovluğa get ..."
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr "Açmaq istədiyiniz qovluğu seçin"
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Yeni bir qısa yol yarat"
 
-#: shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:618
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Qısa yolun nişanlayacağı qovluğu seçin:"
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "Xətdə _İşlə"
 
-#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr "Xətdən Qopuq _İşlə"
 
-#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr "Xətdən Qopuq İşlə"
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "( Heç bir qovluq göstərilmir )"
 
-#: shell/e-shell-view.c:1861
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1863
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(Heç Biri)"
 
-#: shell/e-shell-view.c:1910
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution hazırda xətdədir. Xətdən çıxmaq üçün bu düyməyə basın."
 
-#: shell/e-shell-view.c:1917
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution xətdən çıxmaq gedişatındadır."
 
-#: shell/e-shell-view.c:1923
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26875,12 +27151,12 @@ msgstr ""
 "Fəallaşdırma sistemi xətası:\n"
 "%s"
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerli qeydi quraşdıra bilmədim -- %s"
 
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26891,150 +27167,144 @@ msgstr ""
 "şəkildə öldü. Evolution proqramından çıxıb yenidən başlatmalısınız ki,\n"
 "verilənlərə yenidən çata biləsiniz."
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Hökmsüz arqumentlər"
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "OAF-a qeyd edə bilmirəm"
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Quraşdırma Databeyzi Tapılmadı"
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Ümumi xəta"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "Yeni bir qısa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Qrup adı :"
 
-#: shell/e-shortcuts-view.c:173
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
+#: shell/e-shortcuts-view.c:179
+#, fuzzy, c-format
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
 msgstr ""
 "`%s' Qrupunu qısa yol çubuğundan həqiqətən \n"
 "də silmək istəyisiniz?"
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "Silmə"
-
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Qısa Yol Qrupunu Yenidən Adlandır"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Seçili qısa yol qrupunu belə adlandır:"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "_Kiçik Timsallar"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Qısa yolları kiçik timsallar olaraq göstər"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "_Böyük Timsallar"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Qısa yolları böyük timsallar olaraq göstər"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_Yeni Qrup..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Yeni bir qısa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "Bu Qrupu _Sil..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Bu qısa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "Bu Qrupu _Yenidən Adlandır..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Bu qısa yol qrupunu yenidən adlandır"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "Qısa yol Çubuğunu _Gizlə"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Qısa yol Çubuğunu Gizlə"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create _Default Shortcuts"
 msgstr "Yeni bir qısa yol yarat"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 #, fuzzy
 msgid "Create Default Shortcuts"
 msgstr "Yeni bir qısa yol yarat"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Bu qısa yolu yenidən adlandır"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Bu qısa yolun adını belə dəyişdir:"
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Bu qısa yola körpülənmiş qovluğu aç"
 
-#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Yeni _Pəncərədə Aç"
 
-#: shell/e-shortcuts-view.c:410
+#: shell/e-shortcuts-view.c:417
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Bu qısa yol ilə niçanlanan qovluğu yeni pəncərədə göstər"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "Yeni_dən Adlandır"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Bu qısa yolu yenidən adlandır"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "_Sil"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu qısa yolu qısa yol çubuğundan sil"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Qısa yolları qeyd edərkən xəta oldu."
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Qısa Yollar"
 
@@ -27042,73 +27312,73 @@ msgstr "Qısa Yollar"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Xəta yoxdur"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Eyni adlı bir qovluq onsuz da var"
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Bildirilən qovluq növü hökmlü deyildir"
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "G/Ç xətası"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Qovluğu yaratmaq üçün lazımi disk sahəsi yoxdur"
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "Qovluq boş deyil"
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "Bildirilən qovluq tapıla bilmədi"
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Funksiya yazılmamışdır"
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Əməliyyat dəstəklənmir"
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "Bu qeydlərdə müəyyənləşdirilən növ dəstəklənmir"
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "Bildirilən qovluq təkmilləşdirilə, silinə bilməz"
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Altlarından birinə törəmə qovluq yarada bilmirəm"
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr "Bu adda qovluq yarada bilmədim"
 
-#: shell/e-storage.c:599
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-task-widget.c:191
+#: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:196
+#: shell/e-task-widget.c:216
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% qurtardı)"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 
@@ -27149,84 +27419,81 @@ msgstr ""
 "Fəallaşdırma sistemi xətası:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA xətası"
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Kəsilmiş"
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Səhv qrqument"
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Onsuz da yiyəsi var"
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Yiyəsi yoxdur"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Tapıla bilmədi"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Dəstəklənməyən növ"
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Dəstəklənməyən sxem"
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Dəstəklənməyən gedişat"
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Daxili xəta"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Mövcuddur"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Hökmsüz URI"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Alt qovluqları var"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Heç yer qalmayıb"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Köhnə yiyəsi öldü"
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test type"
 msgstr "Fayl növü:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Fəal bağlantılar"
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Evolutionun ePoçt yazıçısı."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Click OK to close these connections and go offline"
 msgstr "Bu bağlantıları kəsərək xətdən çıxmaq üçün Oldu-ya tıqlayın"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Qovşaq"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr "Aıağıdakı bağlantılar onsuz da fəaldır:"
 
@@ -27250,15 +27517,15 @@ msgstr "_Məktub"
 msgid "_Tasks:"
 msgstr "Vəzifə"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Qovluq adı:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "Qovluq növü:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Qovluğun yaradılacağı yeri göstərin:"
 
@@ -27282,29 +27549,30 @@ msgstr "Qovluq adı:"
 msgid "_User:"
 msgstr "İ_stifadəci Adı:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Sazlama Yardımçısı"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Fayllar İdxal Edilir"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Zaman zolağı"
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Xoş Gəldiniz"
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
+#, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 "Evolution dünyasına xoş gəldiniz. Qabaqdakı ekranlar\n"
 "Evolution proqramına ePoçt hesablarınıza bağlanaraq oradakı\n"
@@ -27312,13 +27580,13 @@ msgstr ""
 "\n"
 "Xahiş edirik, davam etmək üçün \"Sonrakı\" düyməsinə basın. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
 #, fuzzy
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 "Evolution sazlanmağı üçün lazimə bütün məlumatları girdiniz.\n"
 "\n"
@@ -27358,41 +27626,42 @@ msgstr ""
 "Bu vasitə ila vacib xarici faylları Evolution içinə\n"
 "alacaqsınız."
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "İdxalçılar"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "İdxal etmə"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Mənə bir də soruşma"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution aşağıdakı fayllardan verilənləri ala bilər:"
 
-#: shell/main.c:96
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:102
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Evolution əndə çıxır..."
 
-#: shell/main.c:227
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:266
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -27402,79 +27671,114 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:250
+#: shell/main.c:290
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution _FAQ"
 
-#: shell/main.c:259
+#: shell/main.c:298
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Mənə bir də soruşma"
 
-#: shell/main.c:394
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution qabığına çata bilmədim."
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution qabığını başlada bilmədim: %s"
 
-#: shell/main.c:485
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Açılış ekranını gösdərmə"
 
-#: shell/main.c:487
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "İdxal başlanır"
 
-#: shell/main.c:489
+#: shell/main.c:532
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Ağıllı İdxalçılar Başladılır"
 
-#: shell/main.c:491
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr ""
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr "Bütün xəta ayıqlama verilənlərini bir fayla yazdır."
 
-#: shell/main.c:493
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:542
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Bonobo parçalar sistemini başlada bilmədim."
-
-#: tools/evolution-addressbook-abuse.c:80
-#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-abuse.c:81
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Əsas ünvan dəftəri yüklərkən xəta oldu."
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Giriş Faylı"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Yekun Faylı"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "fayl adı bildirilməyib."
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Yapışdırılmış fayl əlavə et ..."
+
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:327
+#, fuzzy
+msgid "Description of the attachment."
+msgstr "Daxil edən izah"
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:329
+#, fuzzy
+msgid "Default subject for the message."
+msgstr "Seçili ismarışları kəs"
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "Qovluq yenidən adlandırıla bilmir: %s"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:3
 #, fuzzy
 msgid "Copy Contact(s) to Another Folder..."
@@ -27568,7 +27872,7 @@ msgstr "indiki vaxt"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr "_Gedişlər"
 
@@ -27687,7 +27991,7 @@ msgid "Print this item"
 msgstr "Bu üzvü çap et"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "Qeyd Et"
 
@@ -27714,7 +28018,7 @@ msgstr "Bu üzvü diskə qeyd et"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Fayl"
 
@@ -27969,7 +28273,7 @@ msgstr "İlgək_lənmiş İsmarışlar Siyahısı"
 msgid "_Expunge"
 msgstr "_Təmizlə"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Qovluq"
 
@@ -28234,7 +28538,7 @@ msgstr "Vəzifə Cavabı"
 
 #: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Post a reply to a message message in a Public folder"
+msgid "Post a reply to a message in a Public folder"
 msgstr "Bütün qovluqlarda yeni ePoçt üçün bax"
 
 #: ui/evolution-mail-message.xml.h:64
@@ -28399,7 +28703,7 @@ msgstr "Sitatlandırılmış"
 msgid "_Resend..."
 msgstr "_Adını Dəyişdir..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Vasitələr"
 
@@ -28414,12 +28718,12 @@ msgstr "Bu pəncərəni qapat"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Close"
 msgstr "_Qapat"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "_Göstər"
 
@@ -28427,6 +28731,10 @@ msgstr "_Göstər"
 msgid "Attach"
 msgstr "Yapışdır"
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Bir fayl yapışdır"
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Hazırkı faylı qapat"
@@ -28597,7 +28905,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Üzvü qeyd et və dialoqu qapat"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr "_Kömək"
 
@@ -28784,128 +29092,118 @@ msgstr "_Pilot Qurğuları..."
 
 #: ui/evolution.xml.h:27
 #, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "_Pilot Qurğuları..."
-
-#: ui/evolution.xml.h:28
-#, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Yeni _Qovluq Yarat..."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Al / Göndər"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Sorğulanmış məktubu göndər və yeni məktubları al"
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "ePoçt Quraşdırılması"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "ePoçt Quraşdırılması"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution haqqında məlumat göstər"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Xəta Raportunu Göndər"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "_Xəta Raportunu Göndər"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug-buddy ilə bir xəta raportunu göndər"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Gizlə/Göstər"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Qovluqlar çubuğunun nümayiş etdiriləcəyi yeri bildir"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Qısa yol çubuğunun nümayiş etdiriləcəyi yeri bildir"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Oflayn işləmənin harda olacağını bildirər"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Seçili qovluğu göstər"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolution Haqqında..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Köçürt..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Qovluq Çubuğu"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Qovluq"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "Qovluğa _Get ..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "_İdxal Et..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Daşı ..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Yeni"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "_Yeni Qovluq"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "Yeni _Qovluq Yarat..."
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Adını Dəyişdir..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Göndər / Al"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "_Qısa Yol Çubuğu"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Qısa Yol"
@@ -28992,9 +29290,8 @@ msgstr "Kateqoriya ilə"
 msgid "_Tasks"
 msgstr "_Vəzifə"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr ""
 
@@ -29020,21 +29317,21 @@ msgstr ""
 "düyməsiylə o qismi böyüdərək seç.\n"
 " Sağ siçan düyməsini uzaqlaşdırmaq üçün işlət."
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "_Hazırkı Görünüş"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:357
+#: widgets/menus/gal-view-menus.c:350
 #, fuzzy
 msgid "Custom View"
 msgstr "_Hazırkı Görünüş"
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "Görünüşləri Müəyyənləşdir"
 
@@ -29045,19 +29342,19 @@ msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1070
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "İndi"
 
-#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr "Bugün"
 
-#: widgets/misc/e-cell-date-edit.c:797
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Gün %s şəklində girilməlidir."
@@ -29066,81 +29363,81 @@ msgstr "Gün %s şəklində girilməlidir."
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Faiz qiyməti ikisi də daxil olam üzərə 0 ilə 100 arasında olmalıdır"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Baltik"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Mərkəzi Avropa"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Çincə"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Kirilcə"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Yunanca"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Yaponca"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Koreyaca"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Türkçə"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Yunikod"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "Qərbi Avropa"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Ənənəvi"
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr "Bəsitləşdirilmiş"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ukraynaca"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 #, fuzzy
 msgid "Visual"
 msgstr "Bağla"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Naməlum hərf dəstəsi: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "İşlədiləcək hərf köməsini girin"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Başqa..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Hərf Kodlaması"
 
@@ -29148,11 +29445,12 @@ msgstr "Hərf Kodlaması"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Axtarış Editoru"
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Axtarışı Qeyd Et"
 
@@ -29171,66 +29469,569 @@ msgstr "Qeydedilmiş Axtarışlara Əlavə Et"
 msgid "_Advanced..."
 msgstr "Ətraflı..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "Məlumat"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "Xəta"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "Sual"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "İsmarış"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "Bu ismarışı bir də göstərmə."
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "A_xtar"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 #, fuzzy
 msgid "_Find Now"
 msgstr "İndi Axtar"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "Təmizlə"
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:833
+msgid "Item ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:840
+msgid "Subitem ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:847
+#, fuzzy
+msgid "Text"
+msgstr "Sınaq"
+
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Təmizlə"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "İndi Axtar"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Şəxsi Ünvan Dəftəri Vericisi"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
+
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Evolutionun İcracı mündəricat parçası."
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "LDIF fayllarını Evolution içinə gətirən emalatxana."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "LDIF fayllarını Evolution içinə gətirir."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "VCard fayllarını Evolution içinə gətirən emalatxana."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "VCard fayllarını Evolution içinə gətirir."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Bonobonun ünvan nümayiş etdirmə vasitəsi."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Bonobonun ünvan nümayiş etdirmə  vasitəsi."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Ünvan dəftəri göstərən nümunəvi Bonobo idarəsi."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Evolution ünvan dəftəri kiçik kartlarını göstərən idarə."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Əlaqələri idarə edici Evolution əlavəsi."
+
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "Evolutionun Ünvan Dəftəri Kiçik Kart emalatxanası"
+
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "Ünvan Dəftəriidə ünvan göstərici"
+
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "Nümunəvi ünvan dəftəri idarəsi emalatxanası"
+
+#, fuzzy
+#~ msgid "380"
+#~ msgstr "389"
+
+#, fuzzy
+#~ msgid "<- _Remove"
+#~ msgstr " _Sil"
+
+#, fuzzy
+#~ msgid "<< Fewer Options"
+#~ msgstr "Seçənəklər"
+
+#, fuzzy
+#~ msgid "DN Customization"
+#~ msgstr "Məlumat Yoxdur"
+
+#, fuzzy
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution Alarmı"
+
+#, fuzzy
+#~ msgid "Mappings"
+#~ msgstr "Kənarlar"
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "Hamısını Seç"
+
+#, fuzzy
+#~ msgid "_Add ->"
+#~ msgstr "_Əlavə Et"
+
+#, fuzzy
+#~ msgid "_Add Mapping"
+#~ msgstr "Gediş əlavə et"
+
+#, fuzzy
+#~ msgid "_Add to DN"
+#~ msgstr "Gediş əlavə et"
+
+#, fuzzy
+#~ msgid "_Always"
+#~ msgstr "Alarm"
+
+#, fuzzy
+#~ msgid "_Delete Mapping"
+#~ msgstr "Hamısını _Sil"
+
+#, fuzzy
+#~ msgid "_Edit Mapping"
+#~ msgstr "Görüşü _düzəlt"
+
+#, fuzzy
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Evolution Alarmı"
+
+#, fuzzy
+#~ msgid "_More Options >>"
+#~ msgstr "_Seçənəklər"
+
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "Hesab %d"
+
+#, fuzzy
+#~ msgid "account-editor"
+#~ msgstr "əlaqə-siyahısı-editoru"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü emalatxanası"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Əlaqə Siyahısını Düzəlt"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Adsız Əlaqələr Siyahısı"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d göstərilmir)"
+
+#, fuzzy
+#~ msgid "C_ontacts..."
+#~ msgstr "_Əlaqələr ..."
+
+#~ msgid "Phone Types"
+#~ msgstr "Telefon Növləri"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "Əlaqəni Silimmi?"
+
+#, fuzzy
+#~ msgid "Display Cards?"
+#~ msgstr "Ekran"
+
+#, fuzzy
+#~ msgid "Display Cards"
+#~ msgstr "Ekran"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Təqvim göstərən Bonobo idarə nümunəsi."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Təqvim göstərən Bonobo idarə nümunəsi."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Evolutionun məktub yazıçısı emalatxanası."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Evolutionun Təqvim əlavəsi."
+
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Evolutionun Vəzifə parçası emalatxanası."
+
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "Təqvim iTip nümayiş idarəsi emalatxanası."
+
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "Nümunəvi Təqvim idarəsi emalaxanası"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "Təqvim editor dialoqları mərkəzləşdirmə emalatxanası."
+
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "Evolutionun komponent editor parçasının emalatxanası."
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Alarm vermə xidməti"
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "GNOME başladıla bilmədi"
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders.  You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "Bu məktub xatırladıcısıdır, amma Evolution bunu hələ ki dəstəkləmir. Bu "
+#~ "xatırladıcı seçənəklərini işlədə bilməyəcəksiniz."
+
+#, fuzzy
+#~ msgid "st"
+#~ msgstr "1.nci"
+
+#, fuzzy
+#~ msgid "nd"
+#~ msgstr "2-ci"
+
+#, fuzzy
+#~ msgid "rd"
+#~ msgstr "3.ncü"
+
+#~ msgid "th"
+#~ msgstr "."
+
+#, fuzzy
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "Bonoboyu başlada bilmədim"
+
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "Komponent düzəltmə emalatxanası yaradıla bilmir"
+
+#~ msgid "Print Calendar"
+#~ msgstr "Təqvimi çap et"
+
+#~ msgid ""
+#~ "Could not create the tasks view.  Please check your ORBit and OAF setup."
+#~ msgstr ""
+#~ "Vəzifə görünüşü yaradıla bilmir. Lütfən ORBIT və OAF qurğularınızı "
+#~ "yoxlayın."
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "\"Evolution\" təqvim qovluğunda olan vəzifələri yeni qovluqlara daşıdı."
+
+#~ msgid ""
+#~ "Evolution has tried to take the tasks that were in your calendar folder "
+#~ "and migrate them to the new tasks folder.\n"
+#~ "Some of the tasks could not be migrated, so this process may be attempted "
+#~ "again in the future."
+#~ msgstr ""
+#~ "\"Evolution\" təqvim qovluğunda olan vəzifələri yeni qovluqlara daşımağa "
+#~ "cəhd etdi.\n"
+#~ "Bəzi vəzifələr daşına bilmədi. Ona görə də bu əməliyyat gələcəkdə də "
+#~ "aparılmalıdır."
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "`%s' tapıla bilmədi; təqvim qovluğuna heç bir vəzifə vəzifələr qovluğuna "
+#~ "daşına bilməyəcək."
+
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "`%s' yükləmək üçün işlədiləcən metod dəstəkləmir;  təqvim qovluğuna heç "
+#~ "bir vəzifə vəzifələr qovluğuna daşına bilməyəcək."
+
+#, fuzzy
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "VCard fayllarını Evolution içinə gətirən emalatxana."
+
+#, fuzzy
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "VCard fayllarını Evolution içinə gətirir."
+
+#, fuzzy
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "VCard fayllarını Evolution içinə gətirir."
+
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr ""
+#~ "İsmarış alına bilmir: %s qovluğundan %s\n"
+#~ "   %s"
+
+#, fuzzy
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Ambara bağlana bilmirəm: %s"
+
+#~ msgid "Warning!"
+#~ msgstr "Xəbərdarlıq!"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Yazıçı pəncərəsini yarada bilmirəm, çünkü siz məktub parçasındakı\n"
+#~ "heç bir qurǧulari, aparmamısınız."
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Evolutionun ePoçt yazma parçasını başlada bilmədim ."
+
+#~ msgid "minute"
+#~ msgstr "dəqiqə"
+
+#~ msgid "hour"
+#~ msgstr "saat"
+
+#~ msgid "week"
+#~ msgstr "həftə"
+
+#~ msgid "year"
+#~ msgstr "il"
+
+#~ msgid "Add action"
+#~ msgstr "Gediş əlavə et"
+
+#~ msgid "Add criterion"
+#~ msgstr "Kriteriya əlavə et"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Evolutionun məktub yazıçısı emalatxanası."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Evolutionun Vəzifə parçası emalatxanası."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Evolutionun məktub yazıçısı emalatxanası."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Evolutionun məktub yazıçısı emalatxanası."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Məktub taşkilatcısı Evolution parçası."
+
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Evolutionun məktub qovluğu nümayişcisi emalatxanası."
+
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Evolutionun məktub yazıçısı emalatxanası."
+
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "Məktub Mündəricatı parçası emalatxanası."
+
+#, fuzzy
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "Xəbərdarlıq: Düzəldilmiş İsmarış"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
+
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Evolutionun poçt quraşdırma parçasını başlada bilmədim ."
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Evolutionun qovluq info parçasını başlada bilmədim ."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "'Mbox'u Evolution içinə gətirən emalatxana"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "'Mbox' fayllarını Evolution içinə gətirir"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr ""
+#~ "'Outlook Express 4' məktublarını Evolution içinə gətirən emalatxana."
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "'Outlook Express 4' fayllarını Evolution içinə gətirir."
+
+#~ msgid "Really delete account?"
+#~ msgstr "Həqiqətən də hesabı silək?"
+
+#, fuzzy
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Sonrakı oxunamış ismarışı göstər"
+
+#, fuzzy
+#~ msgid "Add Signature"
+#~ msgstr "Imzanı qeyd et"
+
+#, fuzzy
+#~ msgid "Account %d"
+#~ msgstr "Hesab"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Şəxsi Ünvan Dəftəri Vericisi; təqvim emalatxanası"
+#, fuzzy
+#~ msgid "_Variable-width:"
+#~ msgstr "Dəyişən"
+
+#~ msgid "All folders"
+#~ msgstr "Bütün qovluqlar"
+
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "Aprel"
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): GNOME_VFS başladıla bilmədi"
+#, fuzzy
+#~ msgid "Display Options"
+#~ msgstr "Göstərmə seçənəkləri"
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): GNOME başladıla bilmədi"
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Belə başlayan ada malik qovluqlar:"
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): Bonobonu başlada bilmədim"
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "Fayl seç"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Evolution İcmalını daxil edən qovluqlar"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr "Məktub Mündəricatı parçası emalatxanası."
+
+#, fuzzy
+#~ msgid "Marquette"
+#~ msgstr "Martiniq"
+
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "İcraçı icmal qismi Bonobo-nu hazırlaya bilmədi.\n"
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Evolutionun məktub yazıçısı emalatxanası."
+
+#~ msgid "Evolution installation"
+#~ msgstr "Evolution qurulması"
+
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "Evolutionun bu yeni qurulmasının şəxsi Evolution qovluğuna\n"
+#~ "bə'zi əlavə fayllar köçürməlidir"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "Lütfən \"Oldu\"'ya tıqlayıb, faylları qurun, ya da \"Ləğv Et\"ə basaraq "
+#~ "çıxın."
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s qovluğunu yarada bilmədim:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Evolution has detected an old\n"
+#~ "Executive-Summary directory.\n"
+#~ "This needs to be removed before\n"
+#~ "Evolution will run.\n"
+#~ "Do you want me to remove this directory?"
+#~ msgstr ""
+#~ "Evolution köhnə İcraçı İcmal\n"
+#~ "cərgəsi tapdı.\n"
+#~ "Evolution icra edilmədən əvəəl\n"
+#~ "bunlar silinməlidir.\n"
+#~ "Bu qovluğu silmək istəyirsiniz?"
+
+#~ msgid "New..."
+#~ msgstr "Yeni ..."
+
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Evolutionun ePoçt Yardımçısı ara üzü başladıla bilmir\n"
+#~ "(%s)"
+
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Evolutionun ePoçt Yardımçısı ara üzü başladıla bilmir\n"
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Qovluq adı keski daxil edə bilməz."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Bug-buddy $PATH yolunda tapıla bilmədi."
+
+#~ msgid "Don't remove"
+#~ msgstr "Silmə"
+
+#~ msgid "Active connections"
+#~ msgstr "Fəal bağlantılar"
+
+#~ msgid "Host"
+#~ msgstr "Qovşaq"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Bonobo parçalar sistemini başlada bilmədim."
+
+#~ msgid "Output File"
+#~ msgstr "Yekun Faylı"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "_Pilot Qurğuları..."
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "ePoçt Quraşdırılması"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Şəxsi Ünvan Dəftəri Vericisi"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Şəxsi Ünvan Dəftəri Vericisi; təqvim emalatxanası"
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): GNOME_VFS başladıla bilmədi"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): GNOME başladıla bilmədi"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 
 #, fuzzy
 #~ msgid "_Configure..."
@@ -29266,9 +30067,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Copy selected messages"
 #~ msgstr "Seçili ismarışları köçür"
 
-#~ msgid "Cut selected messages"
-#~ msgstr "Seçili ismarışları kəs"
-
 #, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr " _Sil"
@@ -29309,9 +30107,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ "Alıcı hazır deyil.\n"
 #~ "Yenidən sınamaq üçün 5 saniyə gözlənir."
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Evolution İdxalçı Yardımçısı"
-
 #, fuzzy
 #~ msgid "_Preferences..."
 #~ msgstr "Təkrarlama _yoxudr"
@@ -29456,9 +30251,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ "vfolderin açıq qaldığı müddət ilə müqayisə\n"
 #~ "ediləcəkdir."
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolution Xəbər Düzəldicisi"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "Bu xəbər hesabını həqiqətən də silmək istəyirsiniz?"
 
@@ -29474,9 +30266,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "News Servers"
 #~ msgstr "_Xəbərlər"
 
-#~ msgid "Source"
-#~ msgstr "Qaynaq"
-
 #~ msgid "Source Information"
 #~ msgstr "Mənbə Məlumatı"
 
@@ -29537,9 +30326,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ "Hökmsüz mənasız iz məlumatı:\n"
 #~ "%s"
 
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Evolutionun İcracı mündəricat parçası."
-
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "Təqvim Mündəricatı parçası emalatxanası."
 
@@ -29641,10 +30427,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgstr "_Düzəlt"
 
 #, fuzzy
-#~ msgid " New "
-#~ msgstr "Yeni"
-
-#, fuzzy
 #~ msgid "Advanced Options"
 #~ msgstr "Əməliyyatı Ləğv Et"
 
@@ -29926,9 +30708,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "New Contact _List"
 #~ msgstr "Yeni Əlaqə _Siyahısı"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Ünvan dəftərini düzəlt"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Ünvan dəftəri əlavə et"
 
@@ -30189,9 +30968,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>Hava vəziyyəti vericisi ilə bağlantı qurula bilmədi</b></dd>"
 
-#~ msgid "Al_l stations:"
-#~ msgstr "Büt_ün dayancaqlar:"
-
 #~ msgid "All _folders:"
 #~ msgstr "Bütün _qovluqlar:"
 
@@ -30210,9 +30986,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "(No name)"
 #~ msgstr "( Adsızdır )"
 
-#~ msgid "New List"
-#~ msgstr "Yeni Siyahı"
-
 #~ msgid "Configure the calendar's settings"
 #~ msgstr "TƏqvim qurğularını quraşdır"
 
diff --git a/po/bg.po b/po/bg.po
index caa4d3e4df..8e5eecdcdc 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1\n"
-"POT-Creation-Date: 2002-10-28 16:49-0500\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2002-08-16 02:00+0300\n"
 "Last-Translator: Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -15,40 +15,52 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "�������, �� ����� �� �� ������ LDIF ������� � ��������."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "�������� �� ����������� �� Evolution"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "����� LDIF ������� � ��������."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "�������� �� ���� �� Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "�������, �� ����� �� �� ������ VCard ������� � ��������."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "�������� �� ���� �� Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "����� VCard ������� � ��������."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "���� ����:"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "���"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "�������"
 
@@ -58,16 +70,17 @@ msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "��������"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "������"
 
@@ -77,12 +90,12 @@ msgid "Bus"
 msgstr "��. ���."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "��������"
 
@@ -93,12 +106,13 @@ msgstr "��������"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "�����������"
@@ -109,18 +123,18 @@ msgstr "���"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "���. ����"
@@ -130,13 +144,13 @@ msgid "Bus Fax"
 msgstr "��. ����"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "������� ����"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "������ 2"
 
@@ -145,43 +159,43 @@ msgid "Bus 2"
 msgstr "�������� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "������� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "�����"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "���� ����"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "�����"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "������"
@@ -192,15 +206,15 @@ msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "��. ���� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "��. ���� 3"
@@ -224,6 +238,7 @@ msgid "Dep"
 msgstr "���"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "����"
@@ -233,6 +248,7 @@ msgid "Off"
 msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "�����"
@@ -247,6 +263,7 @@ msgid "Prof"
 msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "��������"
@@ -260,6 +277,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "������"
@@ -269,16 +287,19 @@ msgid "Nick"
 msgstr "������"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1418
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "������(�)"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1459
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "URI �� ��������"
 
@@ -296,249 +317,349 @@ msgid "FBUrl"
 msgstr "FBUrl"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Default server calendar"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "��������"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "���� �� �������"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "����"
+
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-card-simple.c:893
 #: addressbook/backend/ebook/e-destination.c:706
 #, fuzzy
 msgid "Unnamed List"
 msgstr "���������� ������ � ��������"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "��������� VCards"
+#: addressbook/backend/ebook/e-card.c:1308
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "����� ���"
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard �� %s"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_�����:"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "������� �����"
+
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "�����"
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "���� �� �������"
+
+#: addressbook/backend/ebook/e-card.c:1355
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1369
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "�����������"
+
+#: addressbook/backend/ebook/e-card.c:1390
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "����"
+
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+#, fuzzy
+msgid "Mailer"
+msgstr ""
+"\n"
+"�������� ��������: "
+
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "���_�����/���� URL:"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "��������"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-#: addressbook/backend/ebook/load-pine-addressbook.c:22
-#: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
-#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "��������� �� �������?"
+
+#: addressbook/backend/ebook/e-card.c:1480
+#, fuzzy
+msgid "Category List"
+msgstr "����������� �"
+
+#: addressbook/backend/ebook/e-card.c:1487
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1494
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1501
+#, fuzzy
+msgid "List"
+msgstr "�����"
+
+#: addressbook/backend/ebook/e-card.c:1508
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "���� �����"
+
+#: addressbook/backend/ebook/e-card.c:1515
+#, fuzzy
+msgid "Arbitrary"
+msgstr "��������"
+
+#: addressbook/backend/ebook/e-card.c:1522
+#, fuzzy
+msgid "ID"
+msgstr "1-��"
+
+#: addressbook/backend/ebook/e-card.c:1529
+#, fuzzy
+msgid "Last Use"
+msgstr "�������"
+
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "���������"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "�� ���� �� ������������� Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:2978
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "�����..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "��������"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "_��� �� ������:"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "���� � �����_��� �����"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "�������� �� � LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "������� �������� � LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "����� �������� �� LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1572
-#: addressbook/backend/pas/pas-backend-ldap.c:1575
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "������� �������� � LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "��������� ����������� �� �������� �� LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 #, fuzzy
 msgid "Error performing search"
 msgstr "������ ��� ��������� �� �����"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 #, fuzzy
 msgid "Default Sync Address:"
 msgstr "����� �� ��. ����"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor �� ���� �� ���� �������\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook �� � �������\n"
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "�� ���� �� ��������� wombat ������"
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "�� ���� �� ��������� wombat"
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "������� �� Bonobo �� ������� ���������."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "������� �� Bonobo �� ��������� �� �����."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "����� ������� �� Bonobo ����� ������� ������� �����."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "������� �� ����������� �� Evolution "
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Configure access to LDAP directory servers here"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "���������� ��������� �����"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "��������� �� Evolution �� �������� �� ��������"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "��������� �� ��������� �� ����� � ��������� ����� �� ��������"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "��������� �� ��������� �� ����� � ��������� ����� �� ��������"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "��������� �� ��������� �� ����� � ��������� ����� �� ��������"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 #, fuzzy
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr "������� �� ����������� �� Evolution "
+msgid "Evolution Addressbook component"
+msgstr "�������� �� ���� �� Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "��������� �� ��������� �� ����� � ��������� ����� �� ��������"
 
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:611
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1067
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
 msgstr "��������"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "�����, ����� ������� ������������ �� ��������"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "LDAP ������"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "LDAP ������ �������� ���������� �� �������"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public Contacts"
 msgstr "��������"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public folder containing contact information"
 msgstr "�����, ����� ������� ������������ �� ��������"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "��� �������"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_�������"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Create a new contact"
 msgstr "������ ��� �������"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "��� ������ � ��������"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "������ _��������"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "������ ��� ������ � �������"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "�� ����� �� �� ������ � LDAP �������."
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -546,58 +667,49 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:648
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1193
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP ������� �� ������� %s ����������"
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "������ ��� ��������� ������������ �� �������:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP ������� �� ������� %s ����������"
 
-#: addressbook/gui/component/addressbook-config.c:1630
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL �� �� ������� � ���� ������ �� evolution)"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "������������� ���"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "��� �� �������"
 
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
-msgid "Could not initialize gnome-vfs"
-msgstr "�� ���� �� ������������� gnome-vfs"
+#: addressbook/gui/component/addressbook-config.c:1676
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL �� �� ������� � ���� ������ �� evolution)"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "����� ��������"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "�� ���� �� ������ ��������� �����"
-
-#: addressbook/gui/component/addressbook.c:480
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -605,7 +717,7 @@ msgstr ""
 "�� ���� �� ������ ���� ������� �����. ���������\n"
 "���� ���� ���������� � ���� ����� ����� �� ������."
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:522
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -616,7 +728,7 @@ msgstr ""
 "������ ������� URI, ��� LDAP ������� �� ������.\n"
 " "
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -628,7 +740,7 @@ msgstr ""
 "���������� �� CVS ���� ���� ��� ��������� � ����������� \n"
 "OpenLDAP �� ������������� ������.\n"
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:537
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -639,12 +751,15 @@ msgstr ""
 "������ ������� URI, ��� LDAP ������� �� ������.\n"
 " "
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:582
+#: addressbook/gui/component/addressbook.c:557
+msgid "Unable to open addressbook"
+msgstr "�� ���� �� ������ ��������� �����"
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -652,38 +767,38 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:633
-#: addressbook/gui/component/addressbook.c:636
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "���������� ������ �� %s (���������� %s)"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 #, fuzzy
 msgid "Name begins with"
 msgstr "�������� �"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 #, fuzzy
 msgid "Email begins with"
 msgstr "�������� �"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "����������� �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "��� �� � ���� �������"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "������������..."
 
-#: addressbook/gui/component/addressbook.c:956
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -691,7 +806,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:962
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -699,25 +814,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:968
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:975
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1050
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr "��� �� � ���������"
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -726,139 +841,126 @@ msgstr ""
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr "(����)"
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/component/e-address-popup.c:478
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "������� ����� �� ��. ����"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "������ ��������"
 
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "������ ��� ������� \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "������ ����� ��� ���� ������������� ������� \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "����� � ��������� �����..."
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "���������� ������������ �� ��������"
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "������ ��� ����������"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "���� ������ �� ��. ����"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "������� ���������"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "������� ��������� (������!)"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr " _�������� �� ��������� ������"
 
-#: addressbook/gui/component/ldap-config.glade.h:2
-msgid "1234"
+#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:5
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-#, fuzzy
-msgid "380"
-msgstr "80%"
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "636"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "666"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "<- _Remove"
-msgstr "�����"
+msgid "Add LDAP Server"
+msgstr "LDAP ������"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "�����"
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "��������� �� ������"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always"
 msgstr "������"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Anonymously"
 msgstr "��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -867,79 +969,61 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Connecting"
 msgstr "����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
-msgid "DN Customization"
-msgstr "���� ����������"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "������"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_��� �� ������:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "LDAP ������"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "����� �� ��. ����"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
-msgid "Evolution Attribute"
-msgstr "������ �� Evolution."
-
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "�������� �� �������� ���� �����, �� �� �� ������������ ���� �������"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "�������� �� �������� ���� �����, �� �� �� ������������ ���� �������"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Finished"
 msgstr "��_���"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "�������"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "LDAP Configuration Assistant"
 msgstr "������������"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Mappings"
-msgstr "������"
-
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_�����"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -949,72 +1033,35 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:42
-msgid "Objectclasses Used in Evolution:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses Used on Server:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "����"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "R_estore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Re_store Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "������ �� ���������: "
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
-#: calendar/gui/e-week-view.c:1240
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 msgid "Searching"
 msgstr "�����"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
-msgid "Select"
-msgstr "������ ������"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "������"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -1025,7 +1072,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1034,54 +1081,47 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "�������� �� ����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "��������� ��� �������..."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "����������� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1089,7 +1129,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1098,7 +1138,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1106,17 +1146,17 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
 "directory tree. A search scope of \"sub\" will include all entries below "
 "your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1126,27 +1166,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1156,7 +1196,7 @@ msgstr ""
 "���� ��� �� �� ������� �� ���������������� �� ��������������� �� ���. ������ "
 "�� ���� ��� ���������."
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1164,88 +1204,46 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "Using email address"
 msgstr "���� � �����_��� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:108
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "���_���"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-#, fuzzy
-msgid "_Add ->"
-msgstr "�_�����"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-#, fuzzy
-msgid "_Add Mapping"
-msgstr "������ ��������"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-#, fuzzy
-msgid "_Add to DN"
-msgstr "������ ��������"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-#, fuzzy
-msgid "_Always"
-msgstr "������"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "������� _������"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Display name:"
 msgstr "_�������"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Distinguished Name (DN):"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_Don't use SSL/TLS"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1255,207 +1253,150 @@ msgstr ""
 msgid "_Edit"
 msgstr "_����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "_���������� �����"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-#, fuzzy
-msgid "_Evolution attribute:"
-msgstr "������ �� Evolution."
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_If necessary "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "_LDAP attributes:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-#, fuzzy
-msgid "_More Options >>"
-msgstr "_�����"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "_Port number:"
 msgstr "����:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
-msgid "_Restore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Search base:"
 msgstr "����� � ����:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "��� �� �������:"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "����� �� �������� (������)"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
-#, fuzzy
-msgid "account-druid"
-msgstr "������ %d"
-
-#: addressbook/gui/component/ldap-config.glade.h:132
-#, fuzzy
-msgid "account-editor"
-msgstr "�������� �� ��������"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "cards"
 msgstr "���� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "connecting-tab"
 msgstr "������ ������ � %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:136
-msgid "edit_server_window_simple"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:97
 #, fuzzy
 msgid "general-tab"
 msgstr "�������"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:139
-msgid "objectclasses-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "searching-tab"
 msgstr "�����"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
 msgstr "��������� �� ��������� �� ����� � ��������� ����� �� ��������"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "������� �� ��������� �� ����� � ��������� ����� �� ��������"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "�������� ������"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:699
-#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
-#: shell/e-shortcuts-view.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "��������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr "�������� ������"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "��� ������ � ��������"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "���������� ������������ �� ��������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
 msgid "Send HTML Mail?"
 msgstr "������� HTML ����?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
-msgstr "���������� ����������"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
-msgid "Unnamed Contact List"
-msgstr "���������� ������ � ��������"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d �� �� ��������)"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr "���������� �������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+msgid "Source"
+msgstr "��������"
+
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "����� �� ������� �� ��������� �����"
 
-#: addressbook/gui/component/select-names/e-select-names.c:564
+#: addressbook/gui/component/select-names/e-select-names.c:648
 #, fuzzy
 msgid "Find contact in"
 msgstr "��������� �������"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Find"
+msgstr "������:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "����� �� �����"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 #, fuzzy
 msgid "Selected Contacts:"
 msgstr "��������� �� �������?"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 #, fuzzy
 msgid "Show Contacts"
 msgstr "��������"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid ""
 "Type a name into the entry, or\n"
 "select one from the list below:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
 msgstr "�_��������:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "���_��:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr "�_�� �� ��������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr "_�����..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "���������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr "���� �� ��_�����:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "�_�������..."
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "��_�������..."
@@ -1466,7 +1407,7 @@ msgstr "��������������"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "�������� �� ��������"
 
@@ -1475,7 +1416,7 @@ msgid "D_epartment:"
 msgstr "��_���"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "�������"
 
@@ -1514,1140 +1455,1189 @@ msgstr "��������_���:"
 msgid "P_rofession:"
 msgstr "_��������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "��� �������"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "S_pouse:"
 msgstr "������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "This is the _mailing address"
 msgstr "���� � �����_��� �����"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Wants to receive _HTML mail"
 msgstr "����� �� ��������� _HTML mail"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
-#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
-#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "��� �� ��������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_����:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "URL �� �������� ��������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "_Web �����:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:183
+#, fuzzy
+msgid "Editable"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "���"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr "����������� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Antarctica"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr "������� � ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "�����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "�������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr "����� � �����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr "������ ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
 msgstr "��������� ������������ ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Burkina Faso"
 msgstr "������� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr "���� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
 msgstr "��������� ���������� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "���"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "����������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr "�������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr "������� ���"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "����� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr "���� �� ��������� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "������������ ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "������� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "�� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "������������ ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "����������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "������� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "������� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "������� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "������� ���� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr "������-�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr "������� ���� � ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "����� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "���� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Republic Of"
 msgstr "�����, ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Macau"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Moldova, Republic Of"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "��������� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "���� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr "���� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
 msgid "Pakistan"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
 msgid "Panama"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr "����� ���� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
 msgid "Peru"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr "������ ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr "���"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr "����� ���� � �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr "����� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 #, fuzzy
 msgid "Saint Vincent And The Grena-dines"
 msgstr "����� ������� � ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Samoa"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "San Marino"
 msgstr "��� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
 msgstr "��� ���� � ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr "��������� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr "��������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr "����� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr "���������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr "���� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "������� ���� �������� � ���� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr "��� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr "����� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr "����� ���� � �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
 msgid "Suriname"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "������� �������� � ��� �����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr "�����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Tanzania, United Republic Of"
 msgstr "��������� ��������� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tonga"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr "�������� � ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr "������������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr "������� ����� � ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
 msgstr "��������� ������� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr "����������� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr "����� ������ ������� �� ���"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr "����������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Virgin Islands, British"
 msgstr "��������� ���������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Virgin Islands, U.S."
 msgstr "����������� ���������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr "������� ����� � ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr "������� ������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr "���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zimbabwe"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"������� �� ���, �� ������\n"
-"�� �������� ���� �������?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:459
+#, fuzzy
+msgid "Book"
+msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "��������� �� �������?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
+#, fuzzy
+msgid "Card"
+msgstr "����"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+#, fuzzy
+msgid "Is New Card"
+msgstr "���"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#, fuzzy
+msgid "Writable Fields"
+msgstr "��������� �����"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "���"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "�������� �� ��������� �� � �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:833
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "���� ������� ���������� �� �������� ���������:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "������� ������� ���� VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"������� �� ���, �� ������\n"
+"�� �������� ���� �������?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"������� �� ���, �� ������\n"
+"�� �������� ���� �������?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2440
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�� ���� �� ������ �������� ����� �� ����: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "����� �������� �� �������"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "��������� �����"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "����� ���"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "E-����"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "������ ��� ������������ �� ����: %s"
+
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:221
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2656,151 +2646,148 @@ msgstr ""
 "%s ���� ����������\n"
 "������ �� �� �� �����������?"
 
-#: addressbook/gui/contact-editor/file-exists.glade.h:1
-msgid "Confirm Overwrite"
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:2
-msgid "Don't bother translating this string.  It's not used."
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 #, fuzzy
 msgid "Overwrite"
 msgstr "������������ �� ����?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "����� _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "������� �����"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "�������:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_�����:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "����:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "�������� �����:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "���/���������:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_ZIP ���:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "������� ����� ���"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Dr."
 msgstr "�-�"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "Esq."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "1-��"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "2-��"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "3-��"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "������"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "�-��"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "�-�"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "�-��"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "�-�."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "�-�"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "���:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "�������:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "�������:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_������:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "��������:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "List _name:"
 msgstr "_��� �� ������:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Members"
 msgstr "�������"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 "�������� �-�������� ����� ��� '���������' �������� ����� ������� ������:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_������ �������� ������ ������� ���� �� ���� ������"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "�����"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "contact-list-editor"
 msgstr "�������� �� ��������"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "��� ������"
+
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 msgid "Contact List Editor"
 msgstr "�������� �� ��������"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "������� ������ ���� VCard"
 
@@ -2854,276 +2841,297 @@ msgstr ""
 "����������� ��� ��� �� ��. ���� �� ���� ������� ����\n"
 "���������� � �������. ������ �� �� �� �������� ������� ����?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:153
+#. FIXME: get the toplevel window...
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "������������ �������"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "�������"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "���� �����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 �����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr " %d �����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:408
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:466
+#, fuzzy
+msgid "Query"
+msgstr "������"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 #, fuzzy
 msgid "Error getting book view"
 msgstr "������ ��� ���������� �� %s"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#, fuzzy
+msgid "Model"
+msgstr "�����"
+
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
-#: addressbook/gui/widgets/e-addressbook-util.c:91
-#: addressbook/gui/widgets/e-minicard.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "������ ��� ������������ �� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1141
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr "���������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1171
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "������� �� � ��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "����� ID ���� ����������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "��������� �� �� �������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
-#: camel/camel-service.c:739 camel/camel-service.c:779
-#: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:779
+#: camel/camel-service.c:849 camel/camel-service.c:892
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr "����������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "������������ ��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Required"
 msgstr "������� �������������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "������ `%s' �� ����������."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "����� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:63
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "������ �� �� ��������� ���������?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#, fuzzy
+msgid "_Discard"
+msgstr "������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "������ ��� �������� �� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
-#: addressbook/gui/widgets/e-addressbook-util.c:292
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "������ ��� �������� �� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "������ ��� ������������ �� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "������ ��� ��������� �� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
-#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1588
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "������ ��� ��������� �� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-#, fuzzy
-msgid "Display Cards?"
-msgstr "�������"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-#, fuzzy
-msgid "Display Cards"
-msgstr "�������"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:213
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 #, fuzzy
 msgid "Move card to"
 msgstr "�������� ��������(���/���) �"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 #, fuzzy
 msgid "Copy card to"
 msgstr "������ ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 #, fuzzy
 msgid "Move cards to"
 msgstr "���� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 #, fuzzy
 msgid "Copy cards to"
 msgstr "���� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "��������� VCards"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard �� %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "���"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "������� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
-#: addressbook/gui/widgets/e-addressbook-view.c:813
-#: addressbook/gui/widgets/e-addressbook-view.c:1790
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "������� ���� VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "New Contact..."
 msgstr "��� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 #, fuzzy
 msgid "New Contact List..."
 msgstr "��� ������ � ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "����� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 #, fuzzy
 msgid "Import..."
 msgstr "�����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "���_�� �� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "�������� �� ������� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "��������� �� Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:814
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "�������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "������� ����������� �� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:816
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "����� �� ����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "������� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 #, fuzzy
 msgid "Move to folder..."
 msgstr "�������� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:826
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:827
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:828
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 #, fuzzy
 msgid "Current View"
 msgstr "_����� �������"
@@ -3132,7 +3140,7 @@ msgstr "_����� �������"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�"
 
@@ -3140,11 +3148,11 @@ msgstr ",123,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1290
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3212,20 +3220,61 @@ msgstr "���� �������"
 msgid "Primary Phone"
 msgstr "������� �������"
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr "� %d ����� �����."
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "� ���� ����� �����."
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "������ � ��������� �����"
 
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+#, fuzzy
+msgid "Width"
+msgstr "��������:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "��������:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+#, fuzzy
+msgid "Field"
+msgstr "���������"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "�������"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+#, fuzzy
+msgid "Text Model"
+msgstr "���_��� �� �����"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#, fuzzy
+msgid "Column Width"
+msgstr "��������"
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 #, fuzzy
 msgid ""
 "\n"
@@ -3240,7 +3289,7 @@ msgstr ""
 "\n"
 "�������� ��� ����, �� �� ��������� ��� �������."
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 #, fuzzy
 msgid ""
 "\n"
@@ -3253,21 +3302,41 @@ msgstr ""
 "\n"
 "�������� ��� ����, �� �� ��������� ��� �������."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:452
+#, fuzzy
+msgid "Adapter"
+msgstr "�����"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "������"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "��������� �� ������"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "������� �� �����"
 
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#, fuzzy
+msgid "GTK Tree View"
+msgstr "������ �� �������"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "��������� ����"
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "��������� �����"
 
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
 msgid "Print card"
 msgstr "��������� �����"
 
@@ -3340,7 +3409,6 @@ msgid "Include:"
 msgstr "�������:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "������"
 
@@ -3360,17 +3428,16 @@ msgstr "������"
 msgid "Number of columns:"
 msgstr "���� ������:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "�����"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "����������"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "��������"
 
@@ -3386,9 +3453,7 @@ msgstr "������"
 msgid "Paper source:"
 msgstr "�������� �� ������:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "�������"
 
@@ -3448,43 +3513,167 @@ msgstr "_�����..."
 msgid "Untitled appointment"
 msgstr "���������� �����"
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr "1��"
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "2��"
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "3��"
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr "4��"
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr "5��"
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr "6��"
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr "7��"
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr "8��"
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr "9��"
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr "10��"
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr "11��"
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr "12��"
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr "13��"
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr "14��"
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr "15��"
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr "16��"
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr "17��"
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr "18��"
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr "19��"
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr "20��"
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr "21��"
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "22��"
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "23��"
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr "24��"
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr "25��"
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr "26��"
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr "27��"
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr "28��"
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr "29��"
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr "30��"
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr "31��"
+
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "������"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1721
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "��������"
 
-#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "�����"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr "������������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "������ ��� ������������� � ����������� ������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "�� ���� �� ������� ��������� �� pilot"
 
@@ -3493,86 +3682,77 @@ msgstr "�� ���� �� ������� ��������� �� pilot"
 msgid "Default Priority:"
 msgstr "_���������:"
 
-#: calendar/conduits/todo/todo-conduit.c:951
 #: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "�� ���� �� ������� �������� ��� ������ �� pilot"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "������� �� Bonobo ����� ������� ������ ������"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "����� ������� �� Bonobo �������� ��������."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #, fuzzy
 msgid "Calendar and Tasks"
 msgstr "��������� �� �������� � ������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Calendar."
-msgstr "������� �� ����������� �� Evolution "
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "�������� �� Evolution iTip/iMip �������"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "��������� �� �������� � ������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "��������� �� Evolution �� �������� �� ��������"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "��������� �� Evolution �� ��������� �� �������� �����"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Evolution Tasks control"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
 msgstr "������� �� ������� �� ������ � Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "�������� �� Evolution iTip/iMip �������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
-msgstr "������� �� ����� ������� �� ��������"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "�������� �� Evolution iTip/iMip �������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution - �������� �� ������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "Factory to create a component editor factory"
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution - �������� �� ������"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
 msgstr "�������� ����������� ����������"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Starting:"
 msgstr "���������:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Ending:"
 msgstr "���������:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr "������ �����"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 msgid "Evolution Alarm"
 msgstr "������ �� Evolution."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
 #, c-format
 msgid "Alarm on %s"
 msgstr "������ �� %s"
@@ -3594,11 +3774,17 @@ msgstr "����� �� �������� (������)"
 msgid "_Edit appointment"
 msgstr "_���������� �����"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "���� ��������."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:741
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
+msgid "Warning"
+msgstr "��������"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:849
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3609,13 +3795,7 @@ msgstr ""
 "�� ��. ���� ��� ���, �� ���� ��������� � �������������\n"
 "�� ������� ����."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "��������"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:764
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3626,16 +3806,16 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:778
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "�� �������� ���� ��������� ������."
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "�� ���� �� ������������� GNOME"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "�� ���� �� ������������� gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3651,36 +3831,36 @@ msgstr "���������� �� ��������"
 msgid "Comment contains"
 msgstr "���������� �� ��������"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr "����������"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:409 calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:416
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:440 calendar/gui/calendar-commands.c:442
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3691,67 +3871,168 @@ msgstr ""
 "�� ���� �� ������ ���������� ������. ���� ��������� ����������� �� ORBit � "
 "OAF"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
+msgid "Calendar"
+msgstr "��������"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "������� ������� ����� � �������"
+
+#: calendar/gui/calendar-component.c:75
+#, fuzzy
+msgid "Public Calendar"
+msgstr "URL �� �������� ��������:"
+
+#: calendar/gui/calendar-component.c:76
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "������� ������� ����� � �������"
+
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
+msgid "Tasks"
+msgstr "������"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "������� ������� ������ �� �������"
+
+#: calendar/gui/calendar-component.c:85
+#, fuzzy
+msgid "Public Tasks"
+msgstr "��������� �����"
+
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "������� ������� ������ �� �������"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "New appointment"
+msgstr "���� �����"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "_Appointment"
+msgstr "�����"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "������� ���� ����"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "New meeting"
+msgstr "��������� �� �������� �� ������"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "_Meeting"
+msgstr "�����"
+
+#: calendar/gui/calendar-component.c:736
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "������� ���� ������"
+
+#: calendar/gui/calendar-component.c:740
+#, fuzzy
+msgid "New task"
+msgstr "���� ������"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_������"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "������� ���� ������"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "���� �����"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "���� _�����"
+
+#: calendar/gui/calendar-component.c:746
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "������� ���� ����"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
+#: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "��������������"
 
-#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
 msgid "Public"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
+#: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1165
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "�� � ���������"
 
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "� �������"
 
-#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3762,342 +4043,155 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
-#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
-#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:79
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
-#: calendar/gui/e-meeting-model.c:862
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
+#: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:863
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "��"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "_������ �� ���"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "������ �� ������� �������"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "������ �� �������"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "����� �� �����"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
-msgid "Calendar"
-msgstr "��������"
-
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr "������� ������� ����� � �������"
-
-#: calendar/gui/component-factory.c:76
-#, fuzzy
-msgid "Public Calendar"
-msgstr "URL �� �������� ��������:"
-
-#: calendar/gui/component-factory.c:77
-#, fuzzy
-msgid "Public folder containing appointments and events"
-msgstr "������� ������� ����� � �������"
-
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
-#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1063
-msgid "Tasks"
-msgstr "������"
-
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
-msgstr "������� ������� ������ �� �������"
-
-#: calendar/gui/component-factory.c:86
-#, fuzzy
-msgid "Public Tasks"
-msgstr "��������� �����"
-
-#: calendar/gui/component-factory.c:87
-#, fuzzy
-msgid "Public folder containing to-do items"
-msgstr "������� ������� ������ �� �������"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "New appointment"
-msgstr "���� �����"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "_Appointment"
-msgstr "�����"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "������� ���� ����"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "New meeting"
-msgstr "��������� �� �������� �� ������"
-
-#: calendar/gui/component-factory.c:755
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
-msgid "_Meeting"
-msgstr "�����"
-
-#: calendar/gui/component-factory.c:756
-#, fuzzy
-msgid "Create a new meeting request"
-msgstr "������� ���� ������"
-
-#: calendar/gui/component-factory.c:760
-#, fuzzy
-msgid "New task"
-msgstr "���� ������"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "_������"
-
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "������� ���� ������"
-
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "New All Day Appointment"
-msgstr "���� �����"
+msgid "Error while opening the calendar"
+msgstr "������ ��� ������������� � ����������� ������"
 
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "All _Day Appointment"
-msgstr "���� _�����"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
 
-#: calendar/gui/component-factory.c:766
+#: calendar/gui/comp-editor-factory.c:473
 #, fuzzy
-msgid "Create a new all-day appointment"
-msgstr "������� ���� ����"
+msgid "Permission denied to open the calendar"
+msgstr "������� ������"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URI, ����� �� �� ������� � ���������"
 
-#: calendar/gui/control-factory.c:174
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "����� �� ������� ������"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "����� �� ���������� �� �����������"
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "����� �� �������� ������"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "����� �� �������� ������"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "���������� ����� �� ������"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "���������� �� ������"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "��������� �� ���������"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "���� �� ���������"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "������ ����:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "������� ��������"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "��������� ��������:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "�������"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "� ���� ���������:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
-#: filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
 msgid "days"
 msgstr "���"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "������������ ����� �����"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
-#: filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "������"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
-#: filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "������"
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
-msgstr "%d ���"
-
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
-msgstr "1 ���"
-
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
-msgstr "%d �������"
-
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "1 �������"
-
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
-msgstr "%d ������"
-
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
-msgstr "1 ���"
-
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
-msgstr "%d ������"
-
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
-msgstr "1 ������"
-
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
-msgstr "%d �������"
-
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
-msgstr "1 �������"
-
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "������ ���"
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "������� ���������"
-
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "������� email"
-
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "��������� ��������"
-
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
-msgstr "���������� �������� �� ����������"
-
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s ����� ��������� �� �����"
-
-#: calendar/gui/dialogs/alarm-page.c:416
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s ���� ��������� �� �����"
-
-#: calendar/gui/dialogs/alarm-page.c:421
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s �� �������� �� �������"
-
-#: calendar/gui/dialogs/alarm-page.c:430
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s ����� ���� �� �������"
-
-#: calendar/gui/dialogs/alarm-page.c:433
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s ���� ���� �� �������"
-
-#: calendar/gui/dialogs/alarm-page.c:438
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s �� ���� �� �������"
-
-#: calendar/gui/dialogs/alarm-page.c:462
-#, c-format
-msgid "%s at %s"
-msgstr "%s � %s"
-
-#: calendar/gui/dialogs/alarm-page.c:468
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s � ���������� ��� �� ������������"
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4108,46 +4202,63 @@ msgstr "�����"
 msgid "Date/Time:"
 msgstr "����/�����:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "������� ���������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "������ ���"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "���������"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "��������� ��������"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "������� email"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "��������:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_�����..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "����"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "�����"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "���(���)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "���� �� �����"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "���(���)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "�����(�/�)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "������ �� �����"
 
@@ -4171,7 +4282,7 @@ msgstr "30 ������"
 msgid "60 minutes"
 msgstr "60 ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Alerts"
 msgstr "�������"
@@ -4197,7 +4308,8 @@ msgid "Days"
 msgstr "���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "�����"
 
@@ -4210,7 +4322,8 @@ msgid "Minutes"
 msgstr "������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "����������"
 
@@ -4220,7 +4333,8 @@ msgid "S_un"
 msgstr "�_��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "������"
 
@@ -4233,7 +4347,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "�������� �������� �� ��������� � ����������� �� _���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1137
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "������"
 
@@ -4252,7 +4367,8 @@ msgid "Task List"
 msgstr "_������ ��� ������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "���������"
 
@@ -4269,7 +4385,8 @@ msgid "Time format:"
 msgstr "������ �� �����:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "�������"
 
@@ -4278,7 +4395,8 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "�����"
 
@@ -4321,7 +4439,7 @@ msgid "_Fri"
 msgstr "_���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_�������"
 
@@ -4366,156 +4484,160 @@ msgstr "_��"
 msgid "before every appointment"
 msgstr "���� �������� �� �������"
 
-#: calendar/gui/dialogs/cancel-comp.c:56
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:59
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "������� �� ���, �� ������ �� ���������� � �������� ���� �����?"
 
-#: calendar/gui/dialogs/cancel-comp.c:65
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "������� �� ���, �� ������ �� ���������� � �������� ���� ������?"
 
-#: calendar/gui/dialogs/cancel-comp.c:74
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:77
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "������� �� ���, �� ������ �� ���������� � �������� ���� ����� � ��������?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "���� ������� � ���� �������."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "���� ������ � ���� �������."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "���� ����� � �������� � ��� ������."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  ��� ���������� �������. �� �� ������ �� � �� ������� ���������?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  ��� ������ ��������� �������, �� ������� ���������?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "���� ������� � ���� ���������."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "���� ������ � ���� ���������."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "���� ����� � �������� � ��� ��������."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  ��� ����� �������. �� �� ������� �� � �� ������ ���������?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  ��� ������ ��������� �������, �� ������ ���������?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "���������� ������: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " �"
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
 msgstr " (���������� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 msgid "Completed "
 msgstr "���������� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr " (������"
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr "������"
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "�� ���� �� ������ ������!"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
 #, fuzzy
 msgid "Could not update object"
 msgstr "�� ���� �� ������ ������!"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "����������� �� �����"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "����� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "����� � ������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "���� ������"
 
-#: calendar/gui/dialogs/comp-editor.c:1221
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
-#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr "������� ����..."
 
-#: calendar/gui/dialogs/comp-editor.c:1322
-#: calendar/gui/dialogs/comp-editor.c:1346
-#: calendar/gui/dialogs/comp-editor.c:1370
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1331
+#: calendar/gui/dialogs/comp-editor.c:1355
+#: calendar/gui/dialogs/comp-editor.c:1379
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "�� ���� �� ������ �������� ������!"
 
@@ -4573,87 +4695,100 @@ msgstr "�������� ��:"
 msgid "Enter Delegate"
 msgstr "�������� ��������"
 
-#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "�����"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "�������"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "����������"
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:433
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr "�������������"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "�����"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
+#, fuzzy
+msgid "Start date is wrong"
+msgstr "������� ����"
+
+#: calendar/gui/dialogs/event-page.c:610
+msgid "End date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:633
+#, fuzzy
+msgid "Start time is wrong"
+msgstr "������:"
+
+#: calendar/gui/dialogs/event-page.c:640
+msgid "End time is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "�_������ �� ������ ���"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "_����"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "������������"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "_��������������"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "���� � ���"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "_��������"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "_���������������: "
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "������"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "��������"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "������ ������� ����"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "������:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "��������..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "����:"
@@ -4662,19 +4797,23 @@ msgstr "����:"
 msgid "_Start time:"
 msgstr "������:"
 
-#: calendar/gui/dialogs/meeting-page.c:414
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr "��������� � �����������."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "��������� � ���� ���� ��������."
 
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "���� ���� ���� � �� �������!"
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_�������� ��.."
 
@@ -4715,16 +4854,11 @@ msgid "Member"
 msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "����"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
@@ -4732,13 +4866,6 @@ msgstr "����"
 msgid "Status"
 msgstr "������"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "���"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4749,106 +4876,87 @@ msgid "_Change Organizer"
 msgstr "_����� �� �����������"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr "_����� ��������..."
 
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-#, fuzzy
-msgid "st"
-msgstr "1��"
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:75
 #, fuzzy
-msgid "nd"
-msgstr "2��"
+msgid "This and Future Instances"
+msgstr "������� ����� � ������"
 
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
+#: calendar/gui/dialogs/recur-comp.c:77
 #, fuzzy
-msgid "rd"
-msgstr "3��"
+msgid "All Instances"
+msgstr "������ �������"
 
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-msgid "th"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "���� ����� ������� ���������� ����� Evolution �� ���� �� ���������."
 
-#: calendar/gui/dialogs/recurrence-page.c:898
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 #, fuzzy
 msgid "first"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "�������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
 #, fuzzy
 msgid "third"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 #, fuzzy
 msgid "fourth"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 #, fuzzy
 msgid "last"
 msgstr "������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 #, fuzzy
 msgid "Other Date"
 msgstr "���� ����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "���"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "�������"
 
@@ -4912,24 +5020,29 @@ msgstr "������(�/�)"
 msgid "year(s)"
 msgstr "�����(�/�)"
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:58
 #, fuzzy
 msgid "The meeting information has been created. Send it?"
 msgstr "������������ �� ������� � ���������. �� ������� �� ���������� ������?"
 
-#: calendar/gui/dialogs/send-comp.c:59
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "������������ �� ������� � ���������. �� ������� �� ���������� ������?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:68
 #, fuzzy
 msgid "The task assignment information has been created. Send it?"
 msgstr "������������ �� �������� � ���������. �� ������� �� ���������� ������?"
 
-#: calendar/gui/dialogs/send-comp.c:70
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr "������������ �� �������� � ���������. �� ������� �� ���������� ������?"
 
+#: calendar/gui/dialogs/task-details-page.c:397
+#, fuzzy
+msgid "Completed date is wrong"
+msgstr "���������� "
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -4940,42 +5053,40 @@ msgstr "% ����������"
 msgid "Date Completed:"
 msgstr "���� �� �����������:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
-msgid "Needs Action"
-msgstr "���������� ��������"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "�������"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:860
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_���������:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_������:"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "�������"
 
-#: calendar/gui/dialogs/task-editor.c:216
-#: calendar/gui/dialogs/task-editor.c:261
-#: calendar/gui/dialogs/task-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
+#: calendar/gui/dialogs/task-page.c:527
+msgid "Due date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "��������:"
 
@@ -4983,139 +5094,236 @@ msgstr "��������:"
 msgid "Sta_rt Date:"
 msgstr "��_����� ����:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "��������..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_������ ����"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d ���"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 ���"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d �������"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 �������"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d ������"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 ���"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d ������"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 ������"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d �������"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 �������"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "������� email"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "���������� �������� �� ����������"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s ����� ��������� �� �����"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s ���� ��������� �� �����"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s �� �������� �� �������"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s ����� ���� �� �������"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s ���� ���� �� �������"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s �� ���� �� �������"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s � %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s � ���������� ��� �� ������������"
+
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:418
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:419
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:420
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:421
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:422
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:423
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-calendar-table.c:424
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-calendar-table.c:425
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
-#: calendar/gui/e-week-view.c:1917
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1910
 msgid "Deleting selected objects"
 msgstr "������ ��������� ������"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
-#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
-#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_������"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 #, fuzzy
 msgid "_Save as..."
 msgstr "������� ����..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
-#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_�����..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
-#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "������"
 
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
-#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "�������"
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
-#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_�������"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 #, fuzzy
 msgid "_Assign Task"
 msgstr "����������� �� ������"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "�������� ���� _i��������"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "_������� ���� ����������"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "���_����� ���� ������ ���� ���������"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "_������� ��������� ������"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
-#: calendar/gui/e-week-view.c:4240
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-calendar-table.c:1360
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "�������� �� �� �������� ������"
@@ -5124,8 +5332,8 @@ msgstr "�������� �� �� �������� ������"
 msgid "Alarms"
 msgstr "������"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1096
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "����������"
 
@@ -5154,8 +5362,8 @@ msgid "Start Date"
 msgstr "������� ����"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:748
-#: shell/e-shortcuts.c:1051
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "������"
 
@@ -5163,19 +5371,15 @@ msgstr "������"
 msgid "Task sort"
 msgstr "��������� �� ������"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:166
+#: e-util/e-time-utils.c:379
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:161
+#: e-util/e-time-utils.c:388
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -5190,139 +5394,218 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:518
+#: calendar/gui/e-day-view-time-item.c:529
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i ������� ���������"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "���� _�����"
 
-#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "������ ���� _������� �� ����"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 #, fuzzy
 msgid "New Meeting"
 msgstr "�����"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "���� ������"
 
-#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "�����..."
 
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "����� �� _����"
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "����� _�� ����..."
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_������������� ����������"
 
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "�������� ���������..."
 
-#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
-#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "������ ����..."
 
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "���� �� _�����"
 
-#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "�������� ���� _i��������"
 
-#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr "����� ���� ������� ��_����������"
 
-#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr "������ ���� �_������"
 
-#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr "������ ������ _�������"
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "��_���� ����������"
+
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "�����"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d ���"
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "�����"
+
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr "%d �������"
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Every week on "
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:731
+#, fuzzy, c-format
+msgid "Every %d weeks on "
+msgstr "%d �������"
+
+#: calendar/gui/e-itip-control.c:739
+#, fuzzy
+msgid " and "
+msgstr "�����"
+
+#: calendar/gui/e-itip-control.c:746
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:764
+#, fuzzy
+msgid "every month"
+msgstr "���� �����"
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:775
+#, fuzzy
+msgid "Every year"
+msgstr "�����"
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:831
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "����: <b>"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "���������� "
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "i���������� ����������"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "i�������� ������"
 
-#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
-#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 msgid "An unknown person"
 msgstr "���������� �������"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5330,342 +5613,343 @@ msgstr ""
 "<br> ����, ����������� �������� ���������� � ������ �������� �������� �� "
 "������� ����."
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>���</i>"
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Location:"
 msgstr "_���������������: "
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
 #, fuzzy
 msgid "Status:"
 msgstr "_������:"
 
-#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:490
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "�����"
 
-#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "�������� ������"
 
-#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
-#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:444
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 msgid "Choose an action:"
 msgstr "������ ��������:"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "�������� ������"
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "������� ���������� ��������/����"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "�������� ������� �� ������������"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "������� ���������� ����������"
 
-#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
-#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "���������"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ��������� ���������� �� �����."
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "���������� �� �����"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1326
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ������� ������ ���������� �� �������."
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> ������� ������ ���������� �� �������."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "����������� �� �������:"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ����� �� ���� ������� �� �������������� �����."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "���������� �� �������:"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ����� �� ������ ���������� ���������� �� �������.."
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "������ �� ���������� �� �������:"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> �������� �� ��������� �� �������."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "������� �� �����"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> �������� �������."
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "���������� �� �������"
 
-#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
-#: calendar/gui/e-itip-control.c:1245
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ������� ������������ ���������."
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "���� ��������� �� �����"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ��������� ���������� �� ��������."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1393
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ������� ������ ������� � ������.."
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ������� ������ ������� � ������.."
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "����������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ����� �� ���� ������� ��� ������������ ������.."
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ����� �� ������ ���������� ���������� �� ������.."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "������ �� ���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> �������� �� ��������� � ������."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> �������� ������."
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "���� ��������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ��������� ���������� ��������/����."
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "���������� ��������/����"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> ������� �� ��� ���������� �� ��������/����."
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "������ ��������/����"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> �������� �� �������� ��������/����."
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "������� ��������/����"
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "���� ��������/���� ���������"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr "������� �������� �� � ������������� ���������."
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "����������� ������� ���� ����������� ������."
 
-#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr "����������� �� ������� ������� �������� ���������."
 
-#: calendar/gui/e-itip-control.c:1441
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "����������� ���� ������ ������ �� ��������"
 
-#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "������ �� ���� �� ���� ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1916
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "������������ ����������\n"
 
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "������������ ���� �� ���� �� ���� �������!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1739
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:2008
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "������������� ����������"
 
-#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr "������ ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr "������ �� ���� �� ���� ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2206
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "������ �����"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "������ �����"
@@ -5707,223 +5991,227 @@ msgstr "������ ����"
 msgid "date-start"
 msgstr "������� ����"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "������������������"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr "�������"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "������������ �������"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Resources"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr "������������"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:831
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "�����"
 
-#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr "������������������"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr "������ ��������"
 
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
+#: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr "������������ ��������"
 
-#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
+#: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr "�� ��������"
 
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+msgid "Needs Action"
+msgstr "���������� ��������"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:879
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 msgid "In Process"
 msgstr "� �������"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2114
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
+#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "����� �����"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "���� ����������"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_�����"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "�����_�� ���� ��������� ������"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "������� _���������"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_�������� ��������/����"
 
-#: calendar/gui/e-meeting-time-sel.c:544
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr "_�����������"
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr "_������ ���� � �������"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "���_��� ���� � ���� ������"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "_������� ����"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "������� ���� � _���� ������"
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "������ �� �������:"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "���� �� �������:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
 #: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�������� �� ������ � %s"
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "�� ���� �� ������ ������ � `%s'"
 
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "������ ������ �� ��������� �� `%s' �� �� �������"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "������ ��� ���������� �� %s"
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "���� �� �����������"
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "������ ��������� ������"
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 #, fuzzy
 msgid "Expunging"
 msgstr "��������� �� �����"
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "���� _�����..."
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/gnome-cal.c:1541
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "������ ������ �� �������� �� `%s' �� �� �������"
 
-#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1581
+#: calendar/gui/gnome-cal.c:1563
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "������ �� %s"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5931,7 +6219,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5939,7 +6227,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1996
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "������ �������� � %s"
@@ -6005,317 +6293,175 @@ msgstr "��������"
 msgid "September"
 msgstr "���������"
 
-#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr "������ �� ���� ������� �����������."
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "��������� � ���� ���� ��������."
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "���������� �� �������"
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "���������� �� ������"
 
-#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "���������� �� �������"
 
-#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "���������� ��������/����"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "���������� ����������"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 #, fuzzy
 msgid "Updated"
 msgstr "��������"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
 #, fuzzy
 msgid "Refresh"
 msgstr "�������� ������"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "���������� ��������/���� (%s �� %s)"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "i���������� ����������"
 
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "��� ������ �� ��� ������� �� ���������."
 
-#: calendar/gui/main.c:70
-#, fuzzy
-msgid "Could not activate Bonobo"
-msgstr "�� ���� �� ������������� Bonobo"
-
-#: calendar/gui/main.c:99
-msgid "Could not create the component editor factory"
-msgstr "�� ���� �� ������ ������� �� ��������� �� ���������"
-
-#: calendar/gui/print.c:456
-msgid "1st"
-msgstr "1��"
-
-#: calendar/gui/print.c:456
-msgid "2nd"
-msgstr "2��"
-
-#: calendar/gui/print.c:456
-msgid "3rd"
-msgstr "3��"
-
-#: calendar/gui/print.c:456
-msgid "4th"
-msgstr "4��"
-
-#: calendar/gui/print.c:456
-msgid "5th"
-msgstr "5��"
-
-#: calendar/gui/print.c:457
-msgid "6th"
-msgstr "6��"
-
-#: calendar/gui/print.c:457
-msgid "7th"
-msgstr "7��"
-
-#: calendar/gui/print.c:457
-msgid "8th"
-msgstr "8��"
-
-#: calendar/gui/print.c:457
-msgid "9th"
-msgstr "9��"
-
-#: calendar/gui/print.c:457
-msgid "10th"
-msgstr "10��"
-
-#: calendar/gui/print.c:458
-msgid "11th"
-msgstr "11��"
-
-#: calendar/gui/print.c:458
-msgid "12th"
-msgstr "12��"
-
-#: calendar/gui/print.c:458
-msgid "13th"
-msgstr "13��"
-
-#: calendar/gui/print.c:458
-msgid "14th"
-msgstr "14��"
-
-#: calendar/gui/print.c:458
-msgid "15th"
-msgstr "15��"
-
-#: calendar/gui/print.c:459
-msgid "16th"
-msgstr "16��"
-
-#: calendar/gui/print.c:459
-msgid "17th"
-msgstr "17��"
-
-#: calendar/gui/print.c:459
-msgid "18th"
-msgstr "18��"
-
-#: calendar/gui/print.c:459
-msgid "19th"
-msgstr "19��"
-
-#: calendar/gui/print.c:459
-msgid "20th"
-msgstr "20��"
-
-#: calendar/gui/print.c:460
-msgid "21st"
-msgstr "21��"
-
-#: calendar/gui/print.c:460
-msgid "22nd"
-msgstr "22��"
-
-#: calendar/gui/print.c:460
-msgid "23rd"
-msgstr "23��"
-
-#: calendar/gui/print.c:460
-msgid "24th"
-msgstr "24��"
-
-#: calendar/gui/print.c:460
-msgid "25th"
-msgstr "25��"
-
-#: calendar/gui/print.c:461
-msgid "26th"
-msgstr "26��"
-
-#: calendar/gui/print.c:461
-msgid "27th"
-msgstr "27��"
-
-#: calendar/gui/print.c:461
-msgid "28th"
-msgstr "28��"
-
-#: calendar/gui/print.c:461
-msgid "29th"
-msgstr "29��"
-
-#: calendar/gui/print.c:461
-msgid "30th"
-msgstr "30��"
-
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr "31��"
-
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "��"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "��"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "��"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "��"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "��"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "��"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "��"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "������ ��� (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
-#: calendar/gui/print.c:1896
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "������� ������� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "������ ����� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "������� ������ (%Y)"
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "������"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "������: %s"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "���������: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "���������� � ��������: %i"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2364
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr "���������: %s"
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "��������:"
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "��������� ��������"
-
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
-#: my-evolution/e-summary.c:633
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "������� �������"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "����� �� �����"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "������� ���������..."
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-"�� ���� �� ������ ������ �� ������. ���� ��������� ����������� �� ORBit � OAF"
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "URI �� ����� ���  ������ �� ���������"
 
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:472
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6329,94 +6475,54 @@ msgstr ""
 "\n"
 "������������ �� �� ������ �����������?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
-#: mail/mail-callbacks.c:2912
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "�� �������� ���� ��������� ������."
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 #, fuzzy
 msgid "Print Tasks"
 msgstr "��������� �����"
 
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-"Evolution ��� �������� ����� ���� ��� ������ ����� �������� � ����������� �� "
-"������� � ������ ����� ��� ������."
-
-#: calendar/gui/tasks-migrate.c:108
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-"Evolution �� ����� �� ����� �������� ����� ���� ��� ������ ����� �������� � "
-"����������� �� ������� � ������ ����� ��� ������.\n"
-"����� �� ��� �� ����� �� ����� ���������, ���� �� ������� ���� �� �������� "
-"������ ��-�������."
-
-#: calendar/gui/tasks-migrate.c:120
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:133
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-"������ ������ �� ��������� �� `%s' �� �� �������; ���� ����� �� ������� �� "
-"�������� �� ���� �������� � ������� ��� ������"
-
-#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "�������, �� ����� �� �� ������ VCard ������� � ��������."
+msgid "Evolution Calendar intelligent importer"
+msgstr "�������� �� Evolution iTip/iMip �������"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 #, fuzzy
-msgid "Imports iCalendar files into Evolution"
-msgstr "����� VCard ������� � ��������."
+msgid "Evolution iCalendar importer"
+msgstr "�������� �� Evolution iTip/iMip �������"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 #, fuzzy
-msgid "Imports vCalendar files into Evolution"
-msgstr "����� VCard ������� � ��������."
+msgid "Evolution vCalendar importer"
+msgstr "�������� �� Evolution iTip/iMip �������"
 
-#: calendar/importers/icalendar-importer.c:168
-#, fuzzy, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr ""
-"�� ���� �� ������ ���������  %s �� ����� %s\n"
-"  %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "��������� �� ��������"
 
-#: calendar/importers/icalendar-importer.c:180
-#, fuzzy, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "�� ���� �� �� ������ ��� ��������� %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
+msgstr ""
 
-#: calendar/importers/icalendar-importer.c:483
+#: calendar/importers/icalendar-importer.c:404
 #, fuzzy
 msgid "Reminder!!"
 msgstr "�������"
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
 msgstr "��������� �� ��������"
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:663
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6425,11 +6531,15 @@ msgstr ""
 "Evolution ������ �������� ������� �� Pine.\n"
 "������ �� �� �� ����� ����������� � Evolution?"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "��������"
 
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now ������ 0 ���������"
@@ -8072,30 +8182,40 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "������ �� �� ������� �� ���� �����"
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "����������� �� �� ������� �� ���� �����"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "���������� �� �� ������� �� ���� �����"
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "������������ �� �� ������� �� ���� �����"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "������������ �� �� ������� �� ���� �����"
+
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "������������ �� �� ������� �� ���� �����"
+
+#: camel/camel-data-cache.c:133
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr ""
 "�� ���� �� ������ ������� ����: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "�� ���� �� ������ cache ���������� %s"
@@ -8132,87 +8252,94 @@ msgstr "��������� �� ����� %s"
 msgid "You must be working online to complete this operation"
 msgstr "��� ������ �� ��� � 'online' �� �� ��������� ���� ��������"
 
-#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "������� ��� �������� �� ��������� %s: %s"
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-process.c:92
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "������� ��� �������� �� ��������� %s: %s"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "�� ���� �� ������ ���������� %s: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "�������������� �� �����"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "������ ��� ������ � ������: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ��� ���������� �� ������: %s: %s"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "�� ���� �� ������ spool �����"
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "�� ���� �� �������� spool �����"
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "���������� �� ��������� ����� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "�� ���� �� ������ ���������"
 
-#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "������ �� ��������� %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "�������������� �� �����"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "���������� �� ��������� ����� %d �� %d"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "������ �� ��������� - %d �� %d"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "������� ��� ���������� �� �����������"
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "������ ���������"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "������ ���������"
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "������� ��� �������� �� ��������� %s: %s"
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "������� ��� �������� �� ��������� %s: %s"
-
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "������ ��� ������� �� ������: %s: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8221,7 +8348,7 @@ msgstr ""
 "������ �� ���������� ��������� �����: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8230,11 +8357,11 @@ msgstr ""
 "������ ��� ���������� ������� �� �����: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(���������� �� �����) ������� �������� ����� �������"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -8263,7 +8390,7 @@ msgstr "�������� ���������"
 msgid "Copying messages"
 msgstr "�������� �� ����������� � %s"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8271,72 +8398,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:711
+#: camel/camel-gpg-context.c:738
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:761
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:769
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
-#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
-#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr "����������."
 
-#: camel/camel-gpg-context.c:771
+#: camel/camel-gpg-context.c:798
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "��������� ������� �� POP ������: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 #, fuzzy
 msgid "No data provided"
 msgstr "���� ��� �� ����"
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "�� ���� �� ��������� ���� ���������: ���� ������� ���������"
 
-#: camel/camel-gpg-context.c:1082
+#: camel/camel-gpg-context.c:1125
 #, fuzzy, c-format
 msgid ""
-"Failed to GPG %s message: %s\n"
+"Failed to GPG %s: %s\n"
 "\n"
 "%.*s"
 msgstr "������� ��� �������� �� ��������� %s: %s"
 
-#: camel/camel-gpg-context.c:1088
+#: camel/camel-gpg-context.c:1131
 #, fuzzy, c-format
-msgid "Failed to GPG %s message: %s\n"
+msgid "Failed to GPG %s: %s\n"
 msgstr "������� ��� �������� �� ��������� %s: %s"
 
-#: camel/camel-gpg-context.c:1197
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "������� ��� ���������� �� �����������"
 
-#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
-#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
-#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "������� ��� ���������� �� �����������"
 
-#: camel/camel-gpg-context.c:1290
+#: camel/camel-gpg-context.c:1333
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "�� ���� �� ������� �����������: �� ���� �� ������ �������� ����: %s"
@@ -8361,25 +8489,24 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr "�� ���� �� ������� '%s'"
 
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:93 camel/camel-lock.c:112
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "�� ���� �� ������ ��������� ���� �� %s: %s"
 
-#: camel/camel-lock.c:152
+#: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "������ ������� �� ��������� �� ���������� �� ��������� ���� �� %s. ������ "
 "������ ��-�����."
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "������� ��� ���������� �� lock ����������� fcntl(2): %s"
 
-#: camel/camel-lock.c:268
+#: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "������� ��� ���������� �� lock ����������� flcntl(2): %s"
@@ -8389,51 +8516,51 @@ msgstr "������� ��� ���������� �� lock ����������� flcntl(2): %s"
 msgid "Could not check mail file %s: %s"
 msgstr "�� ���� �� ������� �������� ���� %s: %s"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "�� ���� �� ������ �������� ���� %s: %s"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "�� ���� �� ������ �������� �������� ���� %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:157
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "������� ��� ��������� �� ���� ��� ������ ���� %s: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "�� ���� �� ������ ��������� �����: %s"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "�� ���� �� ������� fork: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "���������� �� ����������� �� ���� ��������: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(���������� ������)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "������ ��� ������ �� �������� ����: %s"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "������ ��� ������ �� ���� ��� �������� ���� %s"
 
-#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "������ ��� �������� �� ���� ��� �������� ����: %s"
@@ -8450,26 +8577,26 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 #, fuzzy
 msgid "parse error"
 msgstr "����� ������"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "�� ���� �� ������ %s: ������������ ����� �� �� ������� �� ���� �������"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "�� ���� �� ������ %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "�� ���� �� ������ %s: ���� ������������� ��� � ������."
@@ -8525,11 +8652,11 @@ msgstr ""
 "���� ����� �� �� ������ ��� ������ ��������� CRAM-MD5 ������, ��� ��� � "
 "��������"
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8537,39 +8664,115 @@ msgstr ""
 "���� ����� �� �� ������ ��� ������ ��������� DIGEST-MD5 ������, ��� ��� � "
 "��������"
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr "�������� �� ������� �� ������� ����� �� ����������\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "�������� �� ������� �������� ������� ����� �� ����������\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "�������� �� ������� �� �������\n"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-gssapi.c:48
+msgid "GSSAPI"
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:50
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr "���� ����� �� �� ������ ��� ������ ��������� Kerberos 4 �� ����������"
+
+#: camel/camel-sasl-gssapi.c:148
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:153
+msgid "The provided target_name parameter was ill-formed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:156
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:160
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:165
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:169
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:180
+msgid "The consistency checks performed on the credential failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:183
+msgid "The referenced credentials have expired."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
+msgid "Bad authentication response from server."
+msgstr "������ ���������� �������� �������."
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "������� ��� �������� �� ��������� %s: %s"
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "���������� ���"
+
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "���� ����� �� �� ������ ��� ������ ��������� Kerberos 4 �� ����������"
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8578,11 +8781,6 @@ msgstr ""
 "�� ���� �� ������ Kerberos �����:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr "������ ���������� �������� �������."
-
 #: camel/camel-sasl-login.c:32
 #, fuzzy
 msgid "Login"
@@ -8631,7 +8829,7 @@ msgstr "POP ����� SMTP ���������� �������� ���������� ���������"
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "������������� �� ��������� ����� ��������  %s: %s"
@@ -8651,37 +8849,37 @@ msgstr "URL '%s' �� ������ �� ��������� ����"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' �� ������ �� ��������� ���"
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "����������: %s"
 
-#: camel/camel-service.c:774 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "������� ��� ������� ����� %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "��������� �� ���� ��������: %s: ����� �� � �������"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "��������� �� ���� ��������: %s: ���������� �������"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 #, fuzzy
 msgid "Resolving address"
 msgstr "����������: %s"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "��������� �� ���� ��������: %s: ����� �� � �������"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "��������� �� ���� ��������: %s: ���������� �������"
@@ -8694,12 +8892,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:354 camel/camel-session.c:422
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "���� ������� ��������� �� �������� `%s'"
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8708,179 +8906,179 @@ msgstr ""
 "�� ���� �� ������ ���������� %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:171
 #, c-format
 msgid "Please enter your password for %s"
 msgstr "���� �������� ������ �� %s"
 
-#: camel/camel-smime-context.c:203
+#: camel/camel-smime-context.c:201
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "���������� ���������� �� \"%s\" �� ����������."
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "��������� ���������� �� \"%s\" �� ����������."
 
-#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
+#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "������� ��� �������� �� ���������� �� \"%s\"."
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr ""
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 msgid "Failed to decode message."
 msgstr "������� ��� ���������� �� �����������"
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr "������� ��� �������� �� �����������"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "�� ���� �� ����� �������. ������ �������� �� ���� ���������"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�� ���� �� ������ �������: ������ �������� �� ���� ���������"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "������� ��� �������� �� �����������"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 #, fuzzy
 msgid "Unable to decrypt certificate signature"
 msgstr "������� ��� �������� �� �����������"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "���� � ������:"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 #, fuzzy
 msgid "Certificate has expired"
 msgstr "_������������ ID:"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 #, fuzzy
 msgid "Error in CRL"
 msgstr "������ ��� ����������� �� %s"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 #, fuzzy
 msgid "Out of memory"
 msgstr "����� �����"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 #, fuzzy
 msgid "Unable to verify leaf signature"
 msgstr "������� ��� �������� �� �����������"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 #, fuzzy
 msgid "Certificate Revoked"
 msgstr "_������������ ID:"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 #, fuzzy
 msgid "Invalid purpose"
 msgstr "������ ��������"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "_������������ ID:"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "_������������ ID:"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8889,15 +9087,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, fuzzy, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8915,7 +9113,7 @@ msgstr ""
 "������ �� �� �������� ������� ����?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:690
+#: camel/camel-tcp-stream-ssl.c:833
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8930,35 +9128,35 @@ msgstr ""
 "\n"
 "������ �� �� �������� ������� ����?"
 
-#: camel/camel-tcp-stream-ssl.c:734
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:786
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:804
+#: camel/camel-tcp-stream-ssl.c:947
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "_������������ ID:"
 
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:964
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr "_������������ ID:"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "�� ���� �� ���������� URL `%s'"
@@ -8973,40 +9171,40 @@ msgstr "������ ��� ���������� �� %s"
 msgid "No such message %s in %s"
 msgstr "���� ������ ���������: %s � %s"
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "������� �� ���� ��������� ��� ������ �����"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "�� ���� �� ������ ����� %s: ������ ��������"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "�� ���� �� ������ ����� %s: ���� ������ �����"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "�� ���� �� ����������� ������� %s ������ ��������"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "�� ���� �� ����������� ������� %s ���� ������ �����"
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2611
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "���������� ����������"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2614
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "������� ���������� �� ������: %s"
@@ -9029,52 +9227,52 @@ msgstr "��������� ������� �� IMAP ������: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP ������� ��������: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "�������� �� ������� ������� ������ �����"
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:655
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ������� �� ������� %s ����������"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:691
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "��������� OK �� IMAP ������: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:221
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "�� ���� �� ������ ���������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:240
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "�� ���� �� ������ ��������� �� %s"
 
-#: camel/providers/imap/camel-imap-folder.c:306
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "������� � ���� ��������� � ������������ �� �������."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:548
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "�������� �� ��������� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1872
+#: camel/providers/imap/camel-imap-folder.c:1873
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "������� ��� ���������� �� �����������"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9083,24 +9281,24 @@ msgstr ""
 "�� ���� �� ����� ���������: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "���� ������ ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1931
-#: camel/providers/imap/camel-imap-folder.c:2527
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
 msgid "This message is not currently available"
 msgstr "����������� �� � �������"
 
-#: camel/providers/imap/camel-imap-folder.c:2191
-#: camel/providers/imap/camel-imap-folder.c:2261
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
 msgid "Fetching summary information for new messages"
 msgstr "�������� �������� ���������� �� ���� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:2565
+#: camel/providers/imap/camel-imap-folder.c:2567
 msgid "Could not find message body in FETCH response."
 msgstr "�� ���� �� ������ ������ �� ����������� � FETCH ��������."
 
@@ -9130,7 +9328,7 @@ msgstr "�������� �� ���� ����"
 msgid "Check for new messages in all folders"
 msgstr "������� �� ���� ��������� ��� ������ �����"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "�����"
 
@@ -9160,7 +9358,7 @@ msgstr "�� ������ � ��������� �� ���� �� IMAP �������"
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "������"
 
@@ -9178,62 +9376,61 @@ msgstr "SMTP ������ %s"
 msgid "IMAP service for %s on %s"
 msgstr "%s ������ �� %s �� %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr "��������� ����������"
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "�� ���� �� �� ������ ���  %s (���� %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "�� ���� �� �� ������ � POP �����.\n"
 "������ ��������� ��� �� ���������� %s"
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "���������� �� �� �������"
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "������������ ��������"
 
-#: camel/providers/imap/camel-imap-store.c:1082
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ������ %s �� ������� ��������� ���������� ��� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1092
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "���� �������� �� ���������� ��� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1116
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s���� �������� IMAP �������� �� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1131
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "��� �� ��� ������ ������."
 
-#: camel/providers/imap/camel-imap-store.c:1160
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9244,24 +9441,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1462
-#: camel/providers/imap/camel-imap-store.c:1604
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr "���� ������ ����� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1839
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "� ����� �� ������� �� ���� �� �� ������� ������� 'Return'"
 
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1851
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "���������� ������: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "�� �������� ����� �� � ��������� �� ��� ��������"
 
@@ -9337,8 +9534,8 @@ msgid ""
 msgstr "�� ������ � ���������� �� ������� ���� � ���������� mbox spool �������"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -9350,36 +9547,36 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "�� ���� �� ������ �����: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "������� ���������� ���� � inbox"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "������� mail ���� %s"
 
-#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
 
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "�� ���� �� ����������� �������: %s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "�� ���� �� ������ ���� � ��������� �� ����� `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:394
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "�� ���� �� ������ �������� ���� �� ����� `%s': %s"
@@ -9389,7 +9586,7 @@ msgstr "�� ���� �� ������ �������� ���� �� ����� `%s': %s"
 msgid "Could not save summary: %s: %s"
 msgstr "�� ���� �� ������ ��������� %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:454
+#: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
 msgstr "�� ���� �� ������ ��������� ��� ���������: ���������� �������"
 
@@ -9402,14 +9599,14 @@ msgstr ""
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "�� ���� �� ������ ����������� � maildir �������: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr "������ ���������� �� ���������"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9421,14 +9618,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "������� `%s' �� ����������."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:168
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9443,72 +9640,72 @@ msgid "`%s' is not a maildir directory."
 msgstr "`%s' �� � maildir ����������."
 
 #: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-maildir-store.c:205
 #: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "�� ���� �� ������ ������� `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr "�� � maildir ����������"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:282
-#: camel/providers/local/camel-spool-store.c:312
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 "�� ���� �� �������� �����`%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-summary.c:416
-#: camel/providers/local/camel-maildir-summary.c:545
+#: camel/providers/local/camel-maildir-summary.c:417
+#: camel/providers/local/camel-maildir-summary.c:548
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "�� ���� �� ������ mailbox: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "�������� �� ���� ����"
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "�������� �� ���� ���������"
 
-#: camel/providers/local/camel-maildir-summary.c:729
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:583
-#: camel/providers/local/camel-mbox-summary.c:673
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "������� �����"
 
-#: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "�� ���� �� ������ ��������� �� ������� %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "�� ���� �� ������ mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "���������� �������� �� ���� � ����������"
 
-#: camel/providers/local/camel-mbox-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "�� ���� �� ������ ����������� � mbox �����: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:396
-#: camel/providers/local/camel-mbox-folder.c:404
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9517,11 +9714,11 @@ msgstr ""
 "�� ���� �� ������ ���������  %s �� ����� %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "������� �������� �� � ������������� ���������."
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "�������������� �� ����������� ��������: �������� mailbox?"
 
@@ -9564,75 +9761,75 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "������� `%s' �� � ������. �� � �������."
 
-#: camel/providers/local/camel-mbox-summary.c:350
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "�� ���� �� ������ ������� `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:398
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "������� ������ � ������ ����� �� %ld � ����� %s"
 
-#: camel/providers/local/camel-mbox-summary.c:453
+#: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "�� ���� �� ������� ������� `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:678
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "�� ���� �� ������ ���� `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-spool-summary.c:169
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�� ���� �� ������ ��������� mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-mbox-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "�� ���� �� ������� ������� �������� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:621
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "�� ���� �� ������� ���������� �����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "�� ���� �� ����������� �������: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:716
-#: camel/providers/local/camel-mbox-summary.c:724
-#: camel/providers/local/camel-mbox-summary.c:913
-#: camel/providers/local/camel-mbox-summary.c:921
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "����������� � ������� �� �������� ���� ���� �������������"
 
-#: camel/providers/local/camel-mbox-summary.c:848
-#: camel/providers/local/camel-spool-summary.c:332
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "���������� ������: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:812
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "�� ���� �� ����������� �������: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:976
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "������ ��� ������ � ��������� mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:993
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "�������� � ��������� mailbox ���������: %s: %s"
@@ -9651,67 +9848,67 @@ msgstr "�� ���� �� ������ ����������� � mh �������: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' �� � ����������."
 
-#: camel/providers/local/camel-mh-summary.c:243
+#: camel/providers/local/camel-mh-summary.c:244
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "�� ���� �� ������ MH ����������: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spool ������� �� ����� �� ����� ������������"
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "`%s' �� � maildir ����������."
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "������� `%s/%s' �� ����������."
 
-#: camel/providers/local/camel-spool-store.c:176
+#: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' �� � ��������� ����."
 
-#: camel/providers/local/camel-spool-store.c:193
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool mail ���� %s"
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool ������� �� ����� �� ����� ������������"
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Spool ������� �� ����� �� ����� ������������"
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Spool ������� �� ����� �� ���� �������"
 
-#: camel/providers/local/camel-spool-summary.c:181
-#: camel/providers/local/camel-spool-summary.c:190
-#: camel/providers/local/camel-spool-summary.c:199
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "�� ���� �� ������������� ���������� �����: %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:214
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "�� ���� �� ������������� spool ������� `%s': %s"
 
-#: camel/providers/local/camel-spool-summary.c:244
-#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
 #: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
@@ -9791,45 +9988,45 @@ msgid "Retrieving POP summary"
 msgstr "��������� POP ���������"
 
 #: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:427
-#: camel/providers/pop3/camel-pop3-folder.c:486
-#: camel/providers/pop3/camel-pop3-folder.c:503
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
 #, fuzzy
 msgid "User cancelled"
 msgstr "���������� ����������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:264
+#: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "�� ���� �� ������ �����: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr "����� ��������� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:401
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "���� ��������� � uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:408
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "��������� POP ��������� %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:488
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "�� ���� �� ����� ���������: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 #, fuzzy
 msgid "Unknown reason"
 msgstr "���������� ������"
@@ -9847,7 +10044,7 @@ msgstr "������ ������ �� �������"
 msgid "Delete after %s day(s)"
 msgstr "������� ���� %s ���"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -9872,27 +10069,27 @@ msgstr ""
 "���� ����� �� �� ������ � POP ������ ��������� ���������� ���������� APOP "
 "��������. �������� �� �� ������ �� ������ ����������� �� POP �������."
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "�� ���� �� �� ������ ���  %s (���� %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "�� ���� �� �� ������ � POP �����.\n"
 "������ ��������� ��� �� ���������� %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
 msgstr "�� ���� �� �� ������ ��� POP ������ %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9901,28 +10098,28 @@ msgstr ""
 "�� ���� �� �� ������ � POP ������.\n"
 "������������ �� ��������� ����������"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "IMAP ������� ��������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "�� ���� �� �� ���������� ���� KPOP ������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s ���� �������� POP3 ������ �� %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9931,13 +10128,13 @@ msgstr ""
 "�� ���� �� �� ������ � POP ������.\n"
 "������ ��������� ������ %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:614
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "���� ������ ����� `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9949,50 +10146,50 @@ msgstr ""
 "�� ��������� �� ���� ���� �������� �� ���������� \"sendmail\" �� ��������� "
 "�������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 #, fuzzy
 msgid "Could not parse recipient list"
 msgstr "�� ���� �� ���������� URL `%s'"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "�� ���� �� ������ ��������� ����� �� sendmail: %s: �� � ��������"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "�� ���� �� ������� fork sendmail: %s: ������ �� � ���������"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr "����������� �� ���� �� ���� ���������: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail ������� ��� ������ %s: ������ �� � ���������"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "�� ���� �� ������� %s: ������ �� � ���������"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail ������� ��� ������ %d: ������ �� � ���������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr "��������� �� ���� ���� ���������� sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10000,143 +10197,143 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "�� ��������� �� ���� ���������� ��������� mailhub � SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "����������� ������, ��������� �������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "����������� ������ � ����������� ��� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "��������� �� �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "����������� �� ��������� �� �� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "������� �� �������� ������ ��� �������� �����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "������������ � ������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "������������ ������� ������������� �����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "������������ �� � �������, �������� ������������� �����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "��������� �������� �������� � �����, �������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr "����������� �� � �������: �� �� �������� �� <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "��������� �������� �������� �� � ��������: mailbox �� � �������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "��������� �������� �� � ��������: mailbox �� � �������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "��������� �������� ��������: ������ � �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr "����������� �� � �������; ���� �������� <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr "��������� �������� �� � �����: ����� �� ���������� ����� �� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "��������� �������� �������� � ����������: ��������� ���������� ����� �� "
 "���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "��������� �������� �������� �� � �����: ����� �� mailbox �� � ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "��������� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "���������� � ������� �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "������� �������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 #, fuzzy
 msgid "Welcome response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "�� ���� �� �� ������ � POP �����.\n"
 "������ ��������� ��� �� ���������� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:342
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "������� �������� �� � ������������� ���������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH ������ �� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP ������ %s �� ������� ��������� ��� ���������� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s���� �������� SMTP �������� �� %s@%s"
@@ -10166,11 +10363,11 @@ msgstr "SMTP ���� ���� %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "�� ���� �� ������� ���������: ��������� ����� �� ���������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "��������� �� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "�� ���� �� ������� ���������: ���� ������� ���������"
 
@@ -10179,63 +10376,63 @@ msgstr "�� ���� �� ������� ���������: ���� ������� ���������"
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "�� ���� �� ������� ���������: ���� ������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "SMTP ������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "AUTH ������ �� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "SMTP �������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "������ ��� ��������� �� SASL ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH ������ �� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "AUTH �������� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "��� ������� �� ���������� �� �������.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM �� �������� ������� %s ������ �� � ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM ������ �������  %s: ������ �� � ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10243,81 +10440,81 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "������ ���������� �������� �������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH ������ �� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET ����� ������: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:102
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:113
+#: composer/e-msg-composer-attachment-bar.c:108
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "��������"
 
-#: composer/e-msg-composer-attachment-bar.c:520
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr "������� ��������� ������ �� ������� �� ���������"
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "������ ��������...."
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "�������� ���� ��� �����������"
 
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "�� ���� �� ������� ���� %s: %s"
 
-#: composer/e-msg-composer-attachment.c:177
+#: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "�� ���� �� ������� ���� %s: �� � ��������� ����"
@@ -10335,11 +10532,15 @@ msgid "MIME type:"
 msgstr "MIME ���:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:163
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr "�������� ����������� ��������� �� ��������"
 
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr "�������� ��� �� ������� �����"
 
@@ -10350,45 +10551,45 @@ msgstr "�������� ��� �� ������� �����"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:400
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "�������-��:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "��:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "��:"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "�������� ��������� �� �����������"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:436
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�������� ������ �� ���������� �� ������ ����� �� ���� ���������"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:440
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10399,27 +10600,28 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "�����"
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "���� ��������"
 
-#: composer/e-msg-composer-select-file.c:275
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
 msgstr "�������� ����"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "�� ���� �� ������ ���������� �������� �� PGP"
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10428,34 +10630,30 @@ msgstr ""
 "������ ��� ������ �� ����: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "��������!"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "����� ����������. �� �� ���������?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "������ ��� ������������ �� ����: %s"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ ��� ����������� �� ����: %s"
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "������ ��� ������ �� ����: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "�� ���� �� ������ ��������� �� ���������"
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10464,7 +10662,7 @@ msgstr ""
 "�� ���� �� ������ ��� ���� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10473,7 +10671,16 @@ msgstr ""
 "�� ���� �� ������ ���� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1285
+#, fuzzy, c-format
+msgid ""
+"Unable to copy file descriptor: %s\n"
+"%s"
+msgstr ""
+"�� ���� �� ������ ��� ���� %s:\n"
+"%s"
+
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10482,7 +10689,7 @@ msgstr ""
 "������ ��� ������������� ��������� �� ����: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10490,7 +10697,7 @@ msgstr ""
 "Ximian Evolution ������ ���������� ������� �� ���������� �����.\n"
 "������ �� �� �� ������ �� �� ����������?"
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10501,34 +10708,39 @@ msgstr ""
 "\n"
 "������ �� �� �������� ���������?"
 
-#: composer/e-msg-composer.c:1536
+#: composer/e-msg-composer.c:1555
+msgid "_Discard Changes"
+msgstr ""
+
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "��������������: ������������ ���������"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "������ ����"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Signature:"
 msgstr "������� ���������"
 
-#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "������ ���������"
 
-#: composer/e-msg-composer.c:2796
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2822
+#: composer/e-msg-composer.c:2931
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10536,29 +10748,18 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3858
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:393
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-
-#: composer/evolution-composer.c:408
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "�� ���� �� ������������� ��������� �� Evolution"
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr ""
@@ -10607,8 +10808,111 @@ msgstr "������ �������"
 msgid "Subject does not contain"
 msgstr "������ ���������"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
-#: mail/mail-display.c:192
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:4
+#, fuzzy
+msgid "<b>Out of Office Message:</b>"
+msgstr "����� �����"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "_������:"
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:12
+#, fuzzy
+msgid "Out of Office Assistant"
+msgstr "����� �����"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "������"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "���������� �� ������"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "��������� �� Email"
+
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:9
+#, fuzzy
+msgid "Read Receipts"
+msgstr "����������"
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
+#: e-util/e-component-listener.c:128
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10616,214 +10920,240 @@ msgstr ""
 "���� ��� ������ ��� ���� ����������.\n"
 "�� �� ��������� ��?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "������������ �� ����?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "������� ���� ������"
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "������� ���� ������ �� �������� �� ���� �����"
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 #, fuzzy
 msgid "Sync Categories:"
 msgstr "���������"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:171 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:176 e-util/e-time-utils.c:375
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:181
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:186
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:197
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:201
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:206
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:216
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:221
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:325 e-util/e-time-utils.c:424
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:329 e-util/e-time-utils.c:416
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
+#: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
+#: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:342
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:181
-msgid "seconds"
-msgstr "�������"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 �������"
 
-#: filter/filter-datespec.c:71
-msgid "minute"
-msgstr "������"
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d �������"
 
-#: filter/filter-datespec.c:72
-msgid "hour"
-msgstr "���"
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 ������"
 
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "�������"
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d ������"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "�������"
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 ���"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d ������"
+
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 ���"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr " �����"
+
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 �������"
 
-#: filter/filter-datespec.c:75
-msgid "month"
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d �������"
+
+#: filter/filter-datespec.c:70
+#, fuzzy
+msgid "1 month ago"
 msgstr "�����"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
-msgstr "������"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr " �����"
 
-#: filter/filter-datespec.c:76
-msgid "year"
-msgstr "������"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "������"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr " �����"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 #, fuzzy
 msgid "You must choose a date."
 msgstr "���������� �� �������� ����."
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr "<��������� ��� �� �� �������� ����>"
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "����"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:279
+#: filter/filter-datespec.c:285
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%a %d %b %Y"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
-#, fuzzy, c-format
-msgid "%d %s ago"
-msgstr " �����"
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "�������� ����� �� �� �� �������� ������"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "������� �� ����������"
 
-#: filter/filter-file.c:178
+#: filter/filter-file.c:166
 #, fuzzy
-msgid "You must specify a file name"
+msgid "You must specify a file name."
 msgstr "��� �� ����:"
 
-#: filter/filter-file.c:190
+#: filter/filter-file.c:184
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Spool `%s' �� ���������� ��� �� � ��������� ����"
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 #, fuzzy
 msgid "Choose a file"
 msgstr "������ ��������:"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "������"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "������ ��������"
-
-#: filter/filter-folder.c:149
+#: filter/filter-folder.c:155
 #, fuzzy
-msgid "You must specify a folder.\n"
+msgid "You must specify a folder."
 msgstr "��� �� ����:"
 
-#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "������ �����"
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10832,79 +11162,77 @@ msgstr ""
 "������ � ��������� ����� '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:62
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
 msgid "Important"
 msgstr "�����"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133
+#: filter/filter-label.c:122 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 #, fuzzy
 msgid "Work"
 msgstr "����"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1281
 #, fuzzy
 msgid "Personal"
 msgstr "������"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124
+#: filter/filter-label.c:124 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 #, fuzzy
 msgid "To Do"
 msgstr "����"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1283
 #, fuzzy
 msgid "Later"
 msgstr "����"
 
-#: filter/filter-part.c:545 shell/evolution-test-component.c:49
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 msgid "Test"
 msgstr "����"
 
-#: filter/filter-rule.c:223
+#: filter/filter-rule.c:219
 msgid "You must name this filter."
 msgstr "������ �� ��� ��� ���� ������."
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "��� �� �������:"
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "�����������"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "���"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "��������� ��������"
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "��� ������ �������� �� ���������"
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "��� ����� �� ���������� � ��������"
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "������ ��������"
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "������"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "�������"
 
@@ -10955,7 +11283,7 @@ msgstr ""
 "������� �� ����������� �� ���� ��������\n"
 "� ������� ����� ��� ������ ���."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "��������� �����"
 
@@ -10967,6 +11295,14 @@ msgstr "����� ����������� ��� ��������"
 msgid "ago"
 msgstr "�����"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "������"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "�������"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "������ ���� �����"
@@ -10984,6 +11320,10 @@ msgstr "������� �� ��� �����"
 msgid "vFolder Sources"
 msgstr "��������� �� v�����"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "�������"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "� ������ ������� ���������� �����"
@@ -10996,6 +11336,10 @@ msgstr "� ������ ������� � �������� ���������� �����"
 msgid "with all local folders"
 msgstr "� ������ ������� �����"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "������"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11127,7 +11471,7 @@ msgstr "�� �"
 msgid "is not Flagged"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 #, fuzzy
 msgid "Label"
 msgstr "������"
@@ -11158,7 +11502,7 @@ msgstr "������� ����������� �� �������"
 msgid "Play Sound"
 msgstr "������ ����:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr "����"
 
@@ -11189,12 +11533,12 @@ msgstr "� ��-������ ��"
 msgid "returns less than"
 msgstr "� �� ����� ��"
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "��������:"
 
@@ -11231,8 +11575,9 @@ msgstr "������� �"
 msgid "Stop Processing"
 msgstr "�������� �����������"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "����"
 
@@ -11241,68 +11586,84 @@ msgstr "����"
 msgid "Unset Status"
 msgstr "������ ������"
 
-#: filter/rule-editor.c:180
-msgid "Rules"
-msgstr "�������"
-
-#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
 #, c-format
-msgid "Rule name '%s' is not unique, choose another"
+msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:170
+msgid "Rules"
+msgstr "�������"
+
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "������ �������"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "����������� �� �������"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "��� �� �������:"
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "���� v����� ������ �� ��� ���."
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr "���������� � �� �������� ���� ���� ����� ���� ��������"
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "��������� �� v�����"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution ��������� ������ ����� Elm ����"
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr "���������..."
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr "���� ���������"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr "��������� %s ���� %s"
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, c-format
 msgid "Scanning %s"
 msgstr "������� �� \"%s\""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:353
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
 msgstr "����"
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11310,7 +11671,7 @@ msgstr ""
 "Evolution ������ �������� ������� �� Elm\n"
 "������ �� �� �� ����������� � Evolution?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11322,12 +11683,12 @@ msgstr ""
 "Evolution ������ ������� �� GnomeCard.\n"
 "������ �� �� �� ����� ����������� � Evolution?"
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "���������: %s"
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11342,7 +11703,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11350,7 +11711,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11359,39 +11720,41 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution ��������� ������ ����� ���� �� Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
-#: shell/e-local-storage.c:183
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "�����"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "������� mail ���� %s"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr "������� ����������"
 
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "�������� ������"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "���������"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 #, fuzzy
 msgid "Mail Filters"
 msgstr "���������� ������"
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11399,11 +11762,11 @@ msgstr ""
 "Evolution ������ �������� ������� �� Netscape.\n"
 "������ �� �� �� ����� ����������� � Evolution?"
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution ��������� ������ ����� Pine �����"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -11411,134 +11774,127 @@ msgstr ""
 "Evolution ������ �������� ������� �� Pine.\n"
 "������ �� �� �� ����� ����������� � Evolution?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "������� �� ����������� �� Evolution "
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "������� �� ������� �� ������ � Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Mailer."
-msgstr "������� �� ����������� �� Evolution "
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "������� �� ����������� �� Evolution "
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 #, fuzzy
 msgid "Configure the fonts used by Evolution here"
 msgstr "������� �� ����������� �� Evolution "
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
 msgid "Configure your email accounts here"
 msgstr "������� ��� ��������� �������� ������� � ����� ���������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "��������� �� Evolution �� �������� �� ����."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "������� �� ������� �� ������ � Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Evolution mail composer."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
 msgstr "�������� �� ���� �� Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "�������� �� ���� �� Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "��������� �� Evolution �� ��������� �� �������� �����"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "������� �� ������� �� ������ � Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "��������� �� Mail ������������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "������� �� ����������� �� Evolution "
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "��������� �� Evolution �� ��������� �� �������� �����"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "������� �� ������� �� ������ � Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "��������� �� Evolution �� ��������� �� �������� �����"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
 msgid "Font Preferences"
 msgstr "_���� ����������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "�������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr "��������� �� Mail ������������"
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "����� ��������� ����"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "��������"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "����� ��������� ����"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "��������� �����"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "����� �� ��������� �����"
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "���� ����� �� ���� �� ������� ���������."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "��������..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "������� ����������� �� ���� �����"
 
-#: mail/component-factory.c:805
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11546,285 +11902,282 @@ msgstr ""
 "����� �� ������ ��������� �� ������ ��������� ���������, ���� ��������� ���� "
 "������ � �����."
 
-#: mail/component-factory.c:970
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "�� �� ������� ������ �� ��������� �� ����"
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:998
-#, fuzzy
-msgid "Warning: Unsent Messages"
-msgstr "��������������: ������������ ���������"
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "���� _Mail ���������"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_�������� ���������"
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "������ ���������"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "���� ���������"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "�������� ���������"
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "���� _Mail ���������"
 
-#: mail/component-factory.c:1078
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
-
-#: mail/component-factory.c:1087
-msgid "Cannot initialize Evolution's mail config component."
-msgstr ""
-"�� ���� �� ������������� mail ����������� �� Evolution �� �������������."
-
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "�� ���� �� ������������� mail ����������� �� Evolution �� ����."
-
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
 #, fuzzy
 msgid "Connecting..."
 msgstr "��������� ��� �������..."
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "�� ���� �� ����������� ����������� ��� shell"
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "�������� �� \"%s\""
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "��������"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "�� ���� �� ������ �������� ����������: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d ���"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr "%d �����"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr " %d �������"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr " %d �����������"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr " %d ���������"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "%d ����"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "������� ��������� _����� �� ���������"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "VFolder ����� _����"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "_v����� �� ��������"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "v_����� �� ����������"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "������ ����� _Mailing List"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "������ ����� �_���"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "������ ����� ��_������"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "������ ����� ��_��������"
 
-#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr "������ ����� Mailing _List"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "���������� ���� ���� ���������..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "�����"
 
-#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "�������� �� ��������"
 
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "�������� �� �������"
 
-#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "�������� �� ������"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "��������"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1771
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "����������"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "�������"
 
 #. separator here?
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "��������: ���������"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "��������: �����������"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "������� ���� �_����"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "�������� ���� ��_�����"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "���������� �������"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "�������� � �����..."
 
-#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "������� � �����..."
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "������ �������� � ��������� �����"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "������� ������"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "������ ������� �� �����������"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "������ �� �������� ������"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "������ �� �������� ������ (%s)"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "������ �� �������� ������ (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "�� ������������"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "��������� ���������� �� �����"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "������� �� ������ �� mbox � Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "�������� �� ���� �� Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "����������� mbox ������� � Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "�������� �� ���� �� Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "�������� �� ���� �� Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "������� �� ����������� �� Outlook Express 4 ���� � Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "����������� Outlook Express 4 ������� � Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "�������� �� ���� �� Evolution."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -11863,100 +12216,100 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr "��� �� ��� ��������� ����� ������ �� ������������ ����������."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:159
+#: mail/mail-account-editor.c:146
 msgid "Evolution Account Editor"
 msgstr "�������� �� ������� � Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_����:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_������������ ���:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_���:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "��� �� ���� �� ����� ��� ��������� � ���� ���."
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "������� �� ���, �� ������ �� �������� ���� ������?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "�� ��������"
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "������������ �� �� ������ �������?"
-
-#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr "�������"
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr "���������"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
+#, fuzzy
+msgid "[Default]"
+msgstr "�� ������������"
+
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr "��������"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "������������� ���:"
 
-#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "������ ����"
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail �� %s"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "������ � %s"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail �� %s"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s �������� ������"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr "������ ������� �� ������"
 
-#: mail/mail-autofilter.c:376
+#: mail/mail-autofilter.c:372
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11964,7 +12317,12 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:154
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "�� �������� ���� ��������� ������."
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11976,7 +12334,16 @@ msgstr ""
 "���������� ��� ������ ����.\n"
 "������ �� �� �� ������������� ����?"
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:211
+#, fuzzy
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"���������� � �� ������������� ����������\n"
+"����� �� ��������� ����."
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11984,7 +12351,7 @@ msgstr ""
 "���������� � �� ������������� ����������\n"
 "����� �� ��������� ����."
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11993,7 +12360,7 @@ msgstr ""
 "����� �� ��������� ����."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:254
 #, fuzzy
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
@@ -12002,11 +12369,11 @@ msgstr ""
 "��� ��������� HTML-����������� ���������, �� �������� ���������� �� ����� "
 "HTML ����������� ����:\n"
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "������� ������� ����?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12014,28 +12381,28 @@ msgstr ""
 "����������� ���� ����.\n"
 "�������� �� �� �� �������?"
 
-#: mail/mail-callbacks.c:356
+#: mail/mail-callbacks.c:313
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "���� ��������� ������� ���� Bcc ���������."
 
-#: mail/mail-callbacks.c:364
+#: mail/mail-callbacks.c:322
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "������ �� ������� ���������(�) �� �� ���� �� ��������� �����������."
 
-#: mail/mail-callbacks.c:777
+#: mail/mail-callbacks.c:722
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -12043,28 +12410,28 @@ msgstr ""
 "�� ���� �� ������ ������� ������� �� ���� ������.\n"
 "������ �� �� ���������� ������������ ��?"
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "���������� ��������"
 
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "�� %a, %Y-%m-%d � %H:%M, %%s ������:"
 
-#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "�������� ��������(���/���) �"
 
-#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "������� ��������(���/���) �"
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������� �� ���, �� ������ �� ����������� ������ %d ���������?"
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12072,7 +12439,7 @@ msgstr ""
 "������ �� ����������� ���� ��������� ��������\n"
 "� ������� Drafts."
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12080,42 +12447,46 @@ msgstr ""
 "������ �� ��������� ������ ���� ��������� ��������\n"
 "� ������� Sent."
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������� �� ���, �� ������ �� ���������� �������� %d ���������?"
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "���� ������� ���������"
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "������������ �� ����?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"�� ���� �� ����� ���������: %s\n"
+"  %s"
+
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s ���� ����������\n"
+"������ �� �� �� �����������?"
 
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:2655
+#: mail/mail-callbacks.c:2687
 #, fuzzy
-msgid "Go to next folder with unread messages?"
-msgstr "������� ���������� ����������� ���������"
-
-#: mail/mail-callbacks.c:2662
-msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2905
 msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12125,7 +12496,7 @@ msgstr ""
 "\n"
 "������������ �� �� ������ �����������?"
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12134,65 +12505,65 @@ msgstr ""
 "������ ��� ��������� ������������ �� �������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "������"
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "���������� �� ��������� ����� %d �� %d"
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "��������� �����������"
 
-#: mail/mail-callbacks.c:3156
-msgid "US-Letter"
-msgstr "US-�����"
-
-#: mail/mail-callbacks.c:3197
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "������������� ���������"
 
-#: mail/mail-callbacks.c:3387
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "������� �� ���, �� ������ �� �������� ������ %d ��������� � ������� ��������?"
 
-#: mail/mail-composer-prefs.c:223
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+#, fuzzy
+msgid "Unnamed"
+msgstr "���������� �������"
 
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
+#: mail/mail-composer-prefs.c:335
 #, fuzzy
-msgid " [script]"
-msgstr "���� ��������"
+msgid "You must specify a valid script name."
+msgstr "��� �� ����:"
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
-msgstr ""
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+#, fuzzy
+msgid "[script]"
+msgstr "���� ��������"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
+#: mail/mail-composer-prefs.c:864
 #, fuzzy
-msgid "Unnamed"
-msgstr "���������� �������"
+msgid "Language(s)"
+msgstr "����"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
 #, fuzzy
 msgid "Add script signature"
 msgstr "������ ��������"
 
-#: mail/mail-composer-prefs.c:876
+#: mail/mail-composer-prefs.c:926
 #, fuzzy
-msgid "Add Signature"
-msgstr "������� ���������"
+msgid "Signature(s)"
+msgstr "_���� � ������:"
+
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "����������"
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:382
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -12203,7 +12574,12 @@ msgstr ""
 "\"����������\" ��-���� �� � ������������ �� ����� ���������,\n"
 "����� ��� �� ������ ���� ���������� �� ���� ��������� �� ������."
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "���������� �� ������"
+
+#: mail/mail-config-druid.c:390
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -12213,11 +12589,16 @@ msgstr ""
 "��� �� ��� ������� ������� ����������\n"
 "������������� ��� ������ ��������� �� ����."
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "����, �������� �� �������� �����"
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "��������� �� Email"
+
+#: mail/mail-config-druid.c:402
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -12227,7 +12608,11 @@ msgstr ""
 "������� ������� ����������\n"
 "������������� ��� ������ ��������� �� ����."
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "�������� �� ������"
+
+#: mail/mail-config-druid.c:409
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -12243,156 +12628,139 @@ msgstr ""
 "�� ������� ������� �� ������. ���� �������� ��� �� ���� ������ ����.\n"
 "���� ��� �� ���� ������������� ���� �� ���������."
 
-#. set window title
-#: mail/mail-config-druid.c:637
-msgid "Evolution Account Assistant"
-msgstr "�������� �� Evolution �� �������"
-
-#: mail/mail-config.c:622
-#, c-format
-msgid "Account %d"
-msgstr "������ %d"
-
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "��������� ����������"
 
-#: mail/mail-config.c:2394 mail/mail-config.c:2398
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "��������� ��� �������..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr " _�������� �� ��������� ������"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL �� �� ������� � ���� ������ �� evolution)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL �� �� ������� � ���� ������ �� evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "_������ �� ������������ ��� ��������� �� ���������� ����"
 
-#: mail/mail-config.glade.h:5
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr ""
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Account Editor"
 msgstr "������ %d"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Account ����������"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "�������� �� ������"
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "������ ��������"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add new signature..."
 msgstr "������� ���������"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_������ �� ������������ ��� ��������� �� ���������� ����"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "������ _�������� ����������� ���� ��� ���������� �� ���� ������"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "�������� ���� ��� �����������"
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "�������������"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_����������� �������� �� ��� email"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "���������� ������ �������: %s"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "C_olors"
 msgstr "_�������"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "�������� �� ��� email"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "���� �� ������ �� ����"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "������ ���������"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "������������"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
+#, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
 "������������, ������ ������������ �� ������ � �������.\n"
 "\n"
@@ -12401,306 +12769,303 @@ msgstr ""
 "\n"
 "�������� �� \"�������\" �� �� �������� �����������."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "�� ������������"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "��� �����"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "������������ �� ������ �������:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "���������� �� ������"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr "������ IDs..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "�� ���� �� ������ ���������"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "����� _������"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "���_�����"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Emacs"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "������� �� ��. ���� �������"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "����� �� ��. ����"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_�������� ������� ��� ��������"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "�������� �� Evolution �� �������"
+
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "��������� ��������"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "�������� �"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Font Properties"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "���������� ���������"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "�������� ������ ID..."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_����������� �������� �"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "����������"
-
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "������� � �������"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "������� _��������"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Mail ������������"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "�������������� �� ���������� �����"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "��������� �� _���������"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "����������� �������"
+
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Microsoft"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Mail ������������"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "On Screen fonts"
-msgstr ""
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "���������� ����������"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "��������_���:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _���� ID:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "���� ������ �� ������� ���� ���� � ���������� � ������ _Bcc"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "PGP"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "��������� ��������� ����������"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "�������� ���������� Qmail"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quote original message"
 msgstr "�� ���� �� ������ ���������"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "������� ���� �����_�"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "�������-��:"
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "���������� �� ������"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "����� �� ����������"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Remember this _password"
 msgstr "������� ���� ������"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "�������� ����������"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "�� ������������"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "S_ecurity"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "������� MIME"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "��������� �� Email"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "������ _����� ��� ���������:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "������� � ������� ���������"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "�������� ������� ���_�������"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "������ ������������"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "��� �_�����:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "��� �� ����:"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr ""
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
@@ -12735,10 +13100,11 @@ msgid "V_ariable-width:"
 msgstr "����������"
 
 #: mail/mail-config.glade.h:129
+#, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 "����� ����� � ����������������� �������� �� Evolution �� Mail.\n"
 "\n"
@@ -12813,119 +13179,124 @@ msgid "_Enable"
 msgstr "���������"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "�������� ����"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Full name:"
 msgstr "_����� ���:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "� HTML ����"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Identity"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_������� �������� ��� ��������� � � ��������� �����"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "����� ���� ��� ����������� �� ������"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "������_�� ����������� ���� \"���������\" ����:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_���:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_������ �� ������� �������� �� �������"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "���� ��� ��������� �� HTML ��������� �� �������� ����� �� � �����"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "���� ��_� ��������� �� ���� ��� ����"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "���������� �� ������"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Reply style:"
 msgstr "�������� �� ������"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Script:"
 msgstr "_���������"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "��������� �� Email"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "������ ������� ����"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_���� � ������:"
 
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "���������� Unix mbox"
+
 #: mail/mail-config.glade.h:175
 #, fuzzy
-msgid "_Use secure connection (SSL):"
-msgstr "������� ���������� ������ (_SSL)"
+msgid "_Terminal Font:"
+msgstr "���������� �������:"
 
 #: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Variable-width:"
-msgstr "����������"
+msgid "_Use secure connection (SSL):"
+msgstr "������� ���������� ������ (_SSL)"
 
 #: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "_�����"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "color"
 msgstr " ����"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "��������"
 
@@ -12949,205 +13320,207 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr "�� ���� �� ������ ��������� �������� �� S/MIME"
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"���� ��� ������ ��� ���� ����������.\n"
+"�� �� ��������� ��?"
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "������� ��������"
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "�� ���� �� ������ �������� ����������: %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "������� ��������"
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "������ � %s..."
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "�����"
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "������ Viewer"
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
 #, fuzzy
 msgid "Downloading images"
 msgstr "������� _��������"
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "�������� ������������� �� �����������"
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
 #, fuzzy
 msgid "Overdue:"
 msgstr "�_��������� ������:"
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "_������ �������� � �������"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "������ ��������������� �� ��������"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "������� ��������� ���� (FIXME)"
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "������� �������� ����..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "������� �� \"%s\""
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "%s ��������"
 
-#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
-#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "�� ���� �� ���������� MIME ���������. �������� �� � ������� ���."
 
-#: mail/mail-format.c:783 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "������ �����"
 
-#: mail/mail-format.c:913 mail/message-list.etspec.h:7
-#: mail/message-tags.glade.h:3
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr "��"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "�������-��"
 
-#: mail/mail-format.c:922 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "��"
 
-#: mail/mail-format.c:927
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:932
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:963
-#, fuzzy
-msgid "Mailer"
-msgstr ""
-"\n"
-"�������� ��������: "
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
 "������ ����������."
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "�� ���� �� ������ �������� �� �������� �� PGP"
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1487
 #, fuzzy
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
 "������ ����������."
 
-#: mail/mail-format.c:1892
+#: mail/mail-format.c:1494
 #, fuzzy
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
 "������ ����������."
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "�������� ��� FTP ���� (%s)"
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "�������� ��� ������� ���� (%s) ������� �� ����� \"%s\""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "�������� ��� ������� ���� (%s)"
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "�������� ��� ���������� ����� (%s)"
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "�������� ��� ���������� ������ ����� (\"%s\" type)"
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "������� �����"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "��������������� �� �����"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:748
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr "�� ���� �� ����� ���� ���������� � ����� %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�� ���� �� ����� ���� ���������� � ����� %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
@@ -13157,7 +13530,7 @@ msgstr ""
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�������� ����� \"%s\" � \"%s\" ������"
 
-#: mail/mail-local.c:1351
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13165,12 +13538,12 @@ msgstr ""
 "��� �� ���� ������ �� �������� ���� mailbox,\n"
 "���������� � �� �� ��������� �����."
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "������������� /%s"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr "��� �� ���� �� ��������� ������� �� ��������� �����."
 
@@ -13192,108 +13565,108 @@ msgstr ""
 "������ ��� ���������� �� ��������:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "������"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "������ ����� �����"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "���������� �� ������"
 
-#: mail/mail-ops.c:553 mail/mail-ops.c:582
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
 msgstr "�����, ����������� ���� ��������� �������."
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "��������� �� \"%s\""
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "��������� �� ��������� %d �� %d"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "������ �� ��������� %d �� %d"
 
-#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
 msgid "Complete."
 msgstr "����������."
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "������� ����������� � �����"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "�������� �������� � %s"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "�������� �� ����������� � %s"
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "��������� �� ����� � \"%s\""
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "���������� ���������"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "�������� �� ����� %s"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "������ ��������� %s"
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "�������� ����� %s"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "��������� �� ����� %s"
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "���������� �� �����"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "��������� �� �����"
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "��������� ��������� %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "��������� %d ���������"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "����������� �� %d ���������"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13302,7 +13675,7 @@ msgstr ""
 "�� ���� �� ������ ������� ����: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13311,11 +13684,11 @@ msgstr ""
 "������ ��� ��������� �� ��������� �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "�������� ���������"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13324,54 +13697,54 @@ msgstr ""
 "�� ���� �� ������ ������� ����: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�� ���� �� ������ �������: %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "���������� �� %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "������ ������ � %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "�������"
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(����������� ���������)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "����������� ���������"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "������ ���������"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "����� � �����������"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "�������"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "��� �������� �� �����/������ �����"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "����� �������"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "������:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "����������:"
 
@@ -13379,69 +13752,65 @@ msgstr "����������:"
 msgid "Cancelling..."
 msgstr "������������..."
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "������:%s, ���: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "���: %s, ���: %s"
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr "���: %s"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr "��������� � ���������� �� ����"
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "�������� ������"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "���������� ..."
 
-#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
 msgid "Waiting..."
 msgstr "��������� ..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "����������� �������� ����������."
 
-#: mail/mail-session.c:272
-msgid "_Remember this password"
-msgstr "_������� ���� ������"
-
-#: mail/mail-session.c:273
-#, fuzzy
-msgid "_Remember this password for the remainder of this session"
-msgstr "������� ���� ������ �� �������� �� ���� �����"
-
-#: mail/mail-session.c:330
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "���������� ������ �� %s"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "���������� ������"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:280
+msgid "_Remember this password"
+msgstr "_������� ���� ������"
+
+#: mail/mail-session.c:281
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "������� ���� ������ �� �������� �� ���� �����"
+
+#: mail/mail-signature-editor.c:80
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "�� ���� �� ������ ���������� ����."
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "������� ���������"
-
-#: mail/mail-signature-editor.c:181
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13451,44 +13820,52 @@ msgstr ""
 "\n"
 "������ �� �� �������� ���������?"
 
-#: mail/mail-signature-editor.c:333
+#: mail/mail-signature-editor.c:229
+msgid "_Discard changes"
+msgstr ""
+
+#: mail/mail-signature-editor.c:233
+msgid "Save signature"
+msgstr "������� ���������"
+
+#: mail/mail-signature-editor.c:389
 #, fuzzy
 msgid "Edit signature"
 msgstr "������ ��������"
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:429
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML ���������:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "���:"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "���������� ��������� - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "���������� ���������"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "���������� ���������"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "��������� �� v����� %s"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "���������� �� v����� �� uri: %s"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13497,97 +13874,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "v�����"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "���������� V�����"
 
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "���� �� ����������� �� v����� '%s' ����� �� ����������."
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "��� VFolder"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(���� ����)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - ���������"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "������������"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "����������"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "����������"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "��������� �������� ���������"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "��������� ���������"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "��� ����"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "�����"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "�� ����"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "��� ����"
 
-#: mail/message-list.c:1066
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "����� %l:%M %p"
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2568
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "��������� ������ �� �����������"
 
@@ -13622,47 +13999,47 @@ msgstr "��������"
 msgid "Size"
 msgstr "������"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
 msgstr "�����"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "��������"
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:64
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:65
 #, fuzzy
 msgid "For Your Information"
 msgstr "�������� �� ����������"
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "��������"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "��������"
 
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "�������� �� ������"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 #, fuzzy
 msgid "Review"
 msgstr "�������"
 
-#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13692,53 +14069,44 @@ msgstr "������"
 msgid "_Flag:"
 msgstr "��� �� ����:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "��������� �� ����� ��� %s �� \"%s\""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "��������� �� ����� � ������� ���� �� \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "��������� �� ����� \"%s\""
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "��������� �� ����� \"%s\""
 
-#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "�����"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "������� � �����..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "�� � ������ ������"
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "����, �������� ������."
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "All folders"
-msgstr "������ �����"
-
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "�����"
-
 #: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -13749,66 +14117,47 @@ msgid "Close"
 msgstr "�������"
 
 #: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Display Options"
-msgstr "����� �� �������"
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr "����� ������� �� ����� �������� �:"
-
-#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr "���������� �� ������������:"
 
-#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "�������� ������"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "S_elect server: "
 msgstr "������ �����"
 
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "������ ����"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "�������� ��"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "�_����� ��"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for the Evolution Summary."
-msgstr "������� ������� ��������� �� Evolution"
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "������� ������� ��������� �� Evolution"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Summary component."
+msgid "Evolution Summary"
 msgstr "�������� �� ���� �� Evolution."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
 #, fuzzy
-msgid "Factory for Evolution Summary's configuration control."
-msgstr "������� �� ������� �� ������ � Evolution"
+msgid "Evolution Summary component"
+msgstr "�������� �� ���� �� Evolution."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
 #, fuzzy
-msgid "Factory for the Evolution Summary component."
-msgstr "������� �� ����������� �� Evolution "
+msgid "Evolution Summary configuration control"
+msgstr "������� �� ������� �� ������ � Evolution"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 #, fuzzy
 msgid "Summary Preferences"
 msgstr "��������� �� ���������"
@@ -17210,7 +17559,7 @@ msgid "Hagerstown"
 msgstr "����������"
 
 #. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
 msgid "Hail"
 msgstr "����"
 
@@ -18904,6003 +19253,5994 @@ msgid "Marion-Wytheville"
 msgstr ""
 
 #: my-evolution/Locations.h:1325
-msgid "Marquette"
-msgstr ""
-
-#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marshall"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marte"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marthas Vineyard"
 msgstr ""
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Martinsburg"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsville"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Maryland"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr "������"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Masirah"
 msgstr "������"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massena"
 msgstr "������"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Matamoros"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
 msgstr "������ ���������"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Mattoon"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mayaguez"
 msgstr ""
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayport"
 msgstr ""
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mazatlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McCall"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCarthy"
 msgstr ""
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McComb"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Meacham"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Medford"
 msgstr ""
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Mehamn"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melfa"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr "������"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr "������"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr "������-NAS"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Mendoza"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merida"
 msgstr "������"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Mexicali"
 msgstr ""
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Miami"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Middle East"
 msgstr "������ �����"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middletown"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Midland"
 msgstr ""
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
 msgstr "������/������"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
 msgstr "������/��������"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Miles City"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Milford"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr "������"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Milton"
 msgstr "������"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minchumina"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr "���������� ����"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr "���������� [2]"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr "���������� [3]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minnesota"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minot"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missouri"
 msgstr "������"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Mitchell"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitilini"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Moa"
 msgstr "���"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Mobile Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobridge"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Modesto"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mojave"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Molde"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Moldova"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Molokai"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monclova"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Moncton"
 msgstr ""
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Monida"
 msgstr "������"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monroe"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Montague"
 msgstr ""
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montana"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr "����� ��������"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Cimone"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr "����� ��������"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monterey"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterrey"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr "����������/�������"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montgomery"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Monticello"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Montpelier"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr "������� �������"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montrose"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Morelia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morgantown"
 msgstr ""
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Moriarty"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
 msgstr "������ ����������"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
 msgstr "������ �����������"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Mosinee"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain View"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Vernon"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Mullan"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr "������"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Muncie"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Murcia"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Mus"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Mykonos"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
 msgstr "�������� ������"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Namsos"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nanning"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Napa"
 msgstr "����"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Naples"
 msgstr ""
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Napoli"
 msgstr "������"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Narvik"
 msgstr "������"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr "������"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Natal"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natchez"
 msgstr ""
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nebraska"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Nenana"
 msgstr ""
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Nevada"
 msgstr "������"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Newark"
 msgstr ""
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "New Bedford"
 msgstr ""
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bern"
 msgstr ""
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newcastle"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "New Delhi/Palam"
 msgstr ""
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "Newfoundland"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr "�� ������"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Iberia"
 msgstr ""
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Jersey"
 msgstr "�� ������"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Mexico"
 msgstr "�� �������"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Orleans"
 msgstr "�� �������"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr "�� ������� NAS"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "Newport"
 msgstr "������"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New River"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "Newton"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "New York"
 msgstr "�� ����"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr "�� ���� - ������ ������"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
 msgstr "������� �������"
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Nimes-Garons"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nipawin"
 msgstr ""
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nis"
 msgstr "���"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "Nogales"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nome"
 msgstr ""
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Norfolk"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk NAS"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norrkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "North Adams"
 msgstr ""
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr "������� ��������"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Conway"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Dakota"
 msgstr "������� ������"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Platte"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "Northway"
 msgstr ""
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northwest Territories"
 msgstr ""
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norwich"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Notodden"
 msgstr ""
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
 msgstr "���� ������"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nuevo Laredo"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oakland"
 msgstr "������"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Ocala"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Odense"
 msgstr "������"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odesa"
 msgstr "������"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Oelwen"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Ogden"
 msgstr ""
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohrid"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
 msgstr "������ �������"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
 msgstr "������ ���"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr "�������� ����"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Olathe"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Omaha"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omak"
 msgstr "����"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Omsk"
 msgstr "����"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "Ontario"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Oostende"
 msgstr ""
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oran"
 msgstr "����"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Orange"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Oregon"
 msgstr "������"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orland"
 msgstr "������"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orlando"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Oruro"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Oscoda"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr "����"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Ostrava"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owyhee"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Oxford"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr "������"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paganella"
 msgstr ""
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palermo"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr "����� �� �������"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palmdale"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmer"
 msgstr "������"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palm Springs"
 msgstr "���� ������"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama City"
 msgstr "������ ����"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Pantelleria"
 msgstr ""
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Papa"
 msgstr "����"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paris"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr "�����/���� �� ���"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr "�����/�� �����"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Orly"
 msgstr "�����/����"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Pasco"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Patna"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr "������"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paysandu"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Payson"
 msgstr ""
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Pellston"
 msgstr ""
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pelotas"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pendleton"
 msgstr ""
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "Peoria"
 msgstr "������"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Perm"
 msgstr "����"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perth"
 msgstr "����"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Perugia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "�������������-��������"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philip"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philipsburg"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Phillips"
 msgstr "������"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr "������"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Pierre"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pikeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plymouth"
 msgstr "������"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Point Hope"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Lay"
 msgstr ""
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Mugu"
 msgstr ""
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Poitiers"
 msgstr ""
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponce"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Pontiac"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poprad"
 msgstr "������"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Port Alexander"
 msgstr ""
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr "����-�-�����"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr "���� ��������"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Porterville"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Port Hardy"
 msgstr ""
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hedland"
 msgstr ""
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Portland"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Porto"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto Alegre"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Portoroz"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Porto Santo"
 msgstr "����� �����"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Port Said"
 msgstr "��� ����"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Posadas"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr "������"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poznan"
 msgstr "������"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Praha"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Presidente Prudente"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Pretoria"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Preveza"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Pristina"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Providence"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Provincetown"
 msgstr ""
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provo"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Puebla"
 msgstr "������"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Pueblo"
 msgstr "������"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Plata"
 msgstr "������ �����"
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Suarez"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr "������ �������"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Pula"
 msgstr "����"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pullman"
 msgstr ""
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Cana"
 msgstr "����� ����"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr "����� �����"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Quantico"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quebec"
 msgstr "������"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr "������ ����"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Reading"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Recife"
 msgstr "������"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Redding"
 msgstr "������"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redig"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redmond"
 msgstr "������"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr "������ ��������"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Regina"
 msgstr "������"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Rennes"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Reno"
 msgstr "����"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Renton"
 msgstr "������"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Reus"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reyes"
 msgstr ""
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reynosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Rhinelander"
 msgstr ""
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Rickenbacker"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rieti"
 msgstr ""
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rifle"
 msgstr ""
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rijeka"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 msgid "Rimini"
 msgstr "������"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr "��� ������"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
 msgid "Rivera"
 msgstr "������"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
 #, fuzzy
 msgid "Rivne"
 msgstr "������"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
 msgid "Rivolto"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 msgid "Riyadh"
 msgstr "����"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
 msgid "Roatan"
 msgstr "������"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 msgid "Robore"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
 msgid "Rockland"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
 msgid "Rodos"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 msgid "Rogers"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 msgid "Roma/Ciampino"
 msgstr "���/��������"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr "���/��������"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr "���/����"
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr "������"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
 msgid "Roros"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
 msgid "Rosario"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
 msgid "Roseglen"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 msgid "Rost"
 msgstr "����"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr "������ �� ���"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr "������"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 msgid "Russia"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 msgid "Rutland"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
 msgid "Sacramento"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
 msgid "Saginaw"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
 msgid "Saint Mary's"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 msgid "Saiq"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 msgid "Salem"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 msgid "Salida"
 msgstr "������"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
 msgid "Salina"
 msgstr "������"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 msgid "Salinas"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
 msgid "Salmon"
 msgstr "������"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr "������ (2)"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
 msgid "Salta"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr "���� ���� ����"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
 msgid "Salto"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
 msgid "Salvador"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
 msgid "Samara"
 msgstr "������"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 msgid "Samos"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 msgid "Samsun"
 msgstr "������"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
 msgid "San Angelo"
 msgstr "��� ������"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr "��� �������"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
 msgid "San Carlos"
 msgstr "��� ������"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 msgid "Sandane"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 msgid "Sandberg"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 msgid "Sanderson"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 msgid "San Diego"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr "��� ����� - �������"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr "��� ����� - ���������"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
 msgid "Sanford"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 msgid "San Francisco"
 msgstr "��� ���������"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 msgid "Sangju"
 msgstr ""
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 msgid "San Jose"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
 msgid "San Juan"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr "����-���������"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
 msgid "Sanliurfa"
 msgstr ""
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
 msgid "San Miguel"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 msgid "San Salvador"
 msgstr "��� ��������"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 msgid "San Sebastian"
 msgstr "��� ���������"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
 msgid "Santa Ana"
 msgstr "����� ���"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr "����� ����"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr "����� ��"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
 msgid "Santa Maria"
 msgstr "����� �����"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
 msgid "Santa Monica"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 msgid "Santander"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 msgid "Santarem"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr "����� ����"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
 msgid "Santiago"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr "������� �� ����"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
 msgid "Santorini"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 msgid "Santos"
 msgstr "������"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
 msgid "Sao Paulo"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
 msgid "Sarasota"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
 msgid "Sarzana"
 msgstr ""
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
 msgid "Sayun"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 msgid "Scatsta"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
 msgid "Scranton"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr "������"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
 msgid "Seattle-Boeing"
 msgstr ""
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 msgid "Sedalia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 msgid "Seeb"
 msgstr ""
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr "������������ ������ ����"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
 msgid "Seward"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
 msgid "Shanghai"
 msgstr "������"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
 msgid "Sharjah"
 msgstr ""
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
 msgid "Sharurah"
 msgstr ""
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 msgid "Shawbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
 msgid "Sheldon"
 msgstr ""
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
 msgid "Shelton"
 msgstr "������"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
 msgid "Sheridan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
 msgid "Shiraz"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
 msgid "Shoreham"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 msgid "Show Low"
 msgstr "������ ����"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
 msgid "Sidney"
 msgstr "������"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
 msgid "Silver City"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 msgid "Sindal"
 msgstr "������"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
 msgid "Skive"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 msgid "Skopje"
 msgstr "������"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 msgid "Skwentna"
 msgstr ""
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 msgid "Slana"
 msgstr ""
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 msgid "Smithers"
 msgstr ""
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr "������"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 msgid "Sochi"
 msgstr "����"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 msgid "Socorro"
 msgstr "������"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 msgid "Socotra"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 msgid "Sofia"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 msgid "Sogndal"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 msgid "Somerset"
 msgstr ""
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 msgid "Sonderborg"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
 msgid "Southampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 msgid "South Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 msgid "South Carolina"
 msgstr "���� ��������"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr "���� ������"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 msgid "Southend"
 msgstr ""
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
 msgid "Spencer"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
 msgid "Split"
 msgstr "������"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 msgid "Spokane"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
 msgid "Springfield"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 msgid "Stauning"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr "���������/����"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
 msgid "Staverton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 msgid "Stavropol"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
 msgid "St Joseph"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 msgid "St Louis"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr "�������� (�������)"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr "�������� (�����)"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
 msgid "Storm Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 msgid "Stornoway"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 msgid "St Paul"
 msgstr "���� ����"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr "���� ���������"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
 msgid "Strevell"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
 msgid "Sturgeon Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
 msgid "Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 msgid "Sumter"
 msgstr ""
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
 msgid "Sutton"
 msgstr ""
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr "������"
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
 #, fuzzy
 msgid "Sympheropol"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
 msgid "Tabatinga"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr "������"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 msgid "Tabuk"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
 msgid "Tacna"
 msgstr ""
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr "������"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
 msgid "Taejon"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
 msgid "Taif"
 msgstr "����"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 msgid "Tainan"
 msgstr "������"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 msgid "Taiyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 msgid "Tajima"
 msgstr ""
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr "������ ���������"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr "������"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
 #, fuzzy
 msgid "Tallinn"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
 msgid "Tampa"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
 msgid "Tampere"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
 msgid "Tanana"
 msgstr "������"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
 msgid "Taos"
 msgstr ""
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
 msgid "Taranto"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 msgid "Tarbes"
 msgstr "������"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
 msgid "Tatalina"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr "������"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
 msgid "Tela"
 msgstr "����"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 msgid "Temple"
 msgstr "������"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr "������"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
 msgid "Texas"
 msgstr "������"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
 msgid "Thisted"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
 msgid "Thumrait"
 msgstr ""
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 msgid "Tianjin"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 msgid "Tijuana"
 msgstr "������"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
 msgid "Timisoara"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
 msgid "Tirana"
 msgstr "������"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 msgid "Tiree"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
 msgid "Titusville"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 msgid "Tivat"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr " "
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr "����� ������ �� �����������"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr "����� ������������ ������"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr "����� ���� ������������ ������"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
 msgid "Toledo"
 msgstr "������"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 msgid "Toluca"
 msgstr "������"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 msgid "Tonopah"
 msgstr ""
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 msgid "Topeka"
 msgstr "������"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr "������"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr "������/������"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
 msgid "Toronto"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
 msgid "Torp"
 msgstr "����"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 msgid "Torrance"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 msgid "Torreon"
 msgstr "������"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 msgid "Tottori Airport"
 msgstr "������ ������"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 msgid "Toulouse"
 msgstr "������"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
 msgid "Trabzon"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 msgid "Trapani"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
 msgid "Trelew"
 msgstr ""
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 msgid "Trenton"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 msgid "Trevico"
 msgstr ""
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
 msgid "Trieste"
 msgstr "������"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
 msgid "Truckee"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
 msgstr "������ ������"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr "������"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
 msgid "Tulcea"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 msgid "Tulsa"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 msgid "Tupelo"
 msgstr "������"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 msgid "Turaif"
 msgstr ""
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 msgid "Turin"
 msgstr "������"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 msgid "Turku"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
 msgid "Tyler"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
 msgid "Tyumen"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr "���"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
 msgid "United Arab Emirates "
 msgstr "��������� ������� ��������"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 msgid "Uruguaiana"
 msgstr ""
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
 msgid "Utah"
 msgstr "���"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
 #, fuzzy
 msgid "Uzhgorod"
 msgstr "������/�������"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 msgid "Vadso"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 msgid "Vaerlose"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 msgid "Vagar"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr "������ 2"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 msgid "Valdosta"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
 msgid "Valencia"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 msgid "Valentine"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
 msgid "Van"
 msgstr "���"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 msgid "Vandel"
 msgstr "������"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
 msgid "Varadero"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
 msgid "Varna"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 msgid "Vasteras"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
 msgid "Venezia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 msgid "Venice"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 msgid "Vermont"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 msgid "Vernal"
 msgstr "������"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
 msgid "Vicenza"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr "����"
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
 msgid "Vilhena"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr "������"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr "�������� ����������"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
 msgid "Visalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
 msgid "Vlieland"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 msgid "Volkel"
 msgstr "������"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 msgid "Waco"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
 msgid "Warner Robins"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 msgid "Waterbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 msgid "Waterloo"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 msgid "Watertown"
 msgstr ""
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 msgid "Waterville"
 msgstr ""
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 msgid "Wejh"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
 msgid "Wenatchee"
 msgstr ""
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 msgid "Wendover"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr "������� �������"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 msgid "Westerland"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 msgid "Westfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
 msgstr "������� ���� ����"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr "������� ��������"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
 msgid "Wheeling"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
 msgid "Wick"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 msgid "Wien"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
 msgid "Williston"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 msgid "Winchester"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 msgid "Windsor"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 msgid "Winslow"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
 msgid "Winter Park"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
 msgid "Wisconsin"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
 msgid "Wise"
 msgstr ""
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 msgid "Wooster"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 msgid "Worcester"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 msgid "Worland"
 msgstr ""
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 msgid "Worthington"
 msgstr ""
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
 msgid "Wyoming"
 msgstr "������"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 msgid "Xiamen"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
 msgid "Yakutat"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr "������"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
 msgstr "������ �������"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr "������������"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
 msgid "Yenbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr "����"
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
 msgid "Zadar"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 msgid "Zagreb"
 msgstr "������"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
 msgid "Zanesville"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 msgid "Zaragoza"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr "���� ������"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
 msgid "Zurich"
 msgstr "�����"
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr "������� ������� ��������� �� Evolution"
 
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "�������"
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "���� �����"
 
-#: my-evolution/e-summary-calendar.c:418
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:420
-msgid "%l:%M %d %B"
+#: my-evolution/e-summary-calendar.c:407
+#, fuzzy
+msgid "%l:%M%P %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:438
+#: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr "���� ��������"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "��������� �� ����"
 
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1102
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "������� �����"
 
-#. translators: Put a list of codes for locations you want to see in
-#. My Evolution by default here. You can find the list of all
-#. stations and their codes in Evolution sources.
-#. (evolution/my-evolution/Locations)
-#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:591
-msgid "KBOS"
-msgstr "KBOS"
-
-#: my-evolution/e-summary-preferences.c:584
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com ���� �� ����"
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr "����� �� ����"
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "������ �������� �� ������"
 
-#: my-evolution/e-summary-preferences.c:848
+#: my-evolution/e-summary-preferences.c:621
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�������� URL �� ��������� �� ������ ����� ������ �� ��������"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "������ ��� ����������� �� RDF"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "������"
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 #, fuzzy
 msgid "Add"
 msgstr "�_�����"
 
-#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "������"
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "���� ������"
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(��� ��������)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr "����� �����"
 
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "�����"
 
-#: my-evolution/e-summary.c:188
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:584
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "���� ���������..."
 
-#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "����� �� ���������"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "�������� ���������� �� ��������"
 
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr ""
-
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
 
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " C"
 msgstr " C"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "knots"
 msgstr "������"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr "��./�."
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "inHg"
 msgstr "���� �.��."
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "mmHg"
 msgstr "mmHg"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "miles"
 msgstr "����"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr "���������"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "���� ����"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr "��������� ������"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "��������� ���������"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "����� �����"
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr "�������"
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
 msgid "Invalid"
 msgstr "����������"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "����������"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "�����"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "�����-�����������"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "�����������"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "�����-�����������"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "�����"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "�����-��������"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "��������"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "��-��������"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "��"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "��-��������"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "��������"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "�����-��������"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "�����"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "�����-�����������"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "�����������"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "�����-�����������"
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr "������"
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr "������ � ����������"
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr "���� ������"
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr "������� �����������"
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr "����� ������"
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr "������������ ������"
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr "�������� ������"
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "�������� ���� � �����������"
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr "��������� ��� ����� ����"
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr "�����������"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "����"
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr "���� � ���������"
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr "��� ����"
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr "������ ����"
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr "����� ����"
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr "���� ����"
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr "�������� �����������"
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr "����������� � �����"
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr "����������� �� ����"
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr "����� ����"
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "����"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr "���� � ���������"
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr "���� ����"
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr "������ ����"
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr "����� ����"
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr "������������ ����"
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "������ ����"
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "��� ����"
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr "������ ����"
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr "����� ����"
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr ""
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr ""
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr "���� � ��������"
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr ""
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr ""
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr ""
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr "�����"
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr "���� �����"
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr "������� �����"
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr "����� �����"
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr ""
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr "����� � �����"
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr ""
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr "�����"
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr "���� �����"
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr "������ �����"
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr "����� �����"
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr "�������� �����"
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr "����� � �����"
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr "����"
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr "��� ����"
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr "������ ����"
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr "���� ���"
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr ""
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr "����� � �����"
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr "���������� �����"
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr "���������� ���� ��� ��������"
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr "������ ���������� �����"
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr "���� ���������� ����"
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 msgid "Showers of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr "�����"
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr "��� �����"
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr "������ �����"
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr "�����"
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr "���� �����"
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr "������ �����"
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr "����� �����"
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr "������������ �����"
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 msgid "Spray"
 msgstr "��������"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 msgid "Light spray"
 msgstr "���� ��������"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 msgid "Moderate spray"
 msgstr "������� ��������"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 msgid "Heavy spray"
 msgstr ""
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 msgid "Shallow spray"
 msgstr ""
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 msgid "Partial spray"
 msgstr ""
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
 msgstr ""
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 msgid "Freezing spray"
 msgstr ""
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr "����"
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr "���� ��� ��������"
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr "��� ����"
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr "������ ����"
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr "����� �������"
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr "���� ����"
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr "������� ����"
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr "������� ���� � ���������"
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr "���� ������� ����"
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr "������� ������� ����"
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr "����� ������� ����"
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
+#: my-evolution/metar.c:443 my-evolution/metar.c:452
 msgid "Tornado"
 msgstr "�������"
 
-#: my-evolution/metar.c:443
+#: my-evolution/metar.c:444
 msgid "Tornado in the vicinity"
 msgstr "������� � ���������"
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr "������� �������"
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -24998,33 +25338,34 @@ msgstr ""
 msgid "_Weather"
 msgstr "_�����"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for Evolution folder settings."
-msgstr "������� �� ����������� �� Evolution "
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Shell �� Evolution"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "������� �� ������� �� ������ � Evolution"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 #, fuzzy
 msgid "Folder Settings"
 msgstr "��������� �� ����"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "Shell �� Evolution"
-
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "������� �������"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "�������� ����������"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25033,56 +25374,38 @@ msgstr ""
 "�� ���� �� ��������� �����:\n"
 "%s"
 
-#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, fuzzy, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "������ � %s..."
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 #, fuzzy
 msgid "Add a Folder"
 msgstr "������ �����"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 msgid "Drafts"
 msgstr "�������"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
-#: shell/e-shortcuts.c:1055
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Inbox"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Outbox"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 msgid "Sent"
 msgstr "�������"
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "���������� �� Evolution"
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"������ ������ �� �������� ������ �� ��������� ������������ �������\n"
-"� ������ ����� ���������� �� ��������"
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"����, �������� �� \"OK\" �� �� ����������� ��������� , ��� \"��������\" �� "
-"�� ��������."
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "�� ���� �� ������ �������� ���������"
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -25093,7 +25416,7 @@ msgstr ""
 "%s\n"
 "������: %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -25102,40 +25425,7 @@ msgstr ""
 "�������� ������ ��� ���������� �� ������� �\n"
 "`%s'."
 
-#: shell/e-setup.c:282
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"�� ���� �� ������ ����������\n"
-"%s:\n"
-"%s"
-
-#: shell/e-setup.c:300
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-"������������ %s\n"
-"���� ������������ �����. ���� ��������� �\n"
-"�� ������ � ���������� � �������������� Evolution."
-
-#: shell/e-setup.c:306
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-"����� %s\n"
-"������ �� ���� ������ �� �� ���� Evolution �� ������ ��������.\n"
-"����, ���������� ���� ���� � �������������� Evolution."
-
-#: shell/e-setup.c:329
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25146,16 +25436,7 @@ msgstr ""
 "���������� ��, �� �� ����� ��������� ��\n"
 "�������� �� �� ����������."
 
-#: shell/e-setup.c:343
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25170,27 +25451,27 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "�������� �� ��� ��"
 
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
 msgstr "���� �� �����������"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "��������� �����"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
 msgstr "��������� �����"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "��������� �����"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 #, fuzzy
 msgid "Autocompletion Folders"
 msgstr "���� �� �����������"
@@ -25200,44 +25481,44 @@ msgstr "���� �� �����������"
 msgid "Cannot copy folder: %s"
 msgstr "�� ���� �� ������� ������� `%s': %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, fuzzy, c-format
 msgid "Cannot move folder: %s"
 msgstr ""
 "�� ���� �� ����������� �������:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "�� ���� �� �������� ����� ���� ���� ��."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "�� ���� �� ������� ������������ ����� ���� ��."
 
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:204
 msgid "Cannot move a folder into one of its descendants."
 msgstr "�� ���� �� �������� ����� � ���� �� ������� ��������."
 
-#: shell/e-shell-folder-commands.c:321
+#: shell/e-shell-folder-commands.c:319
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "������� ����� �� �������� �� ����� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "������� �����"
 
-#: shell/e-shell-folder-commands.c:365
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "������� ����� �� �� ���������� � ��� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "�������� �����"
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25246,19 +25527,19 @@ msgstr ""
 "�� ���� �� ������ �������:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
-#, c-format
-msgid "Delete \"%s\""
-msgstr "������ \"%s\""
-
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr ""
 "�� ���� �� ������ �������:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "������ \"%s\""
+
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25267,26 +25548,26 @@ msgstr ""
 "�� ���� �� ����������� �������:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "����������� ������� \"%s\" ��:"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "����������� �����"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:165
+#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-creation-dialog.c:170
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "��������� ��� �� ����� � ���������: %s"
 
-#: shell/e-shell-folder-commands.c:586
+#: shell/e-shell-folder-commands.c:583
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:586
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25295,7 +25576,7 @@ msgstr ""
 "�� ���� �� ����������� �������:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:122
+#: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25304,24 +25585,20 @@ msgstr ""
 "�� ���� �� ������ ��������� �����:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "������ ���� �����..."
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "���..."
-
-#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(����������)"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr "�������� ���� �� ��������� �� ����������:"
 
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -25335,11 +25612,11 @@ msgstr ""
 "��� ���� �� �������� \"�����������\" ��� �� ������ � Evolution �� �� ����� "
 "�� �� ��������."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "����, �������� ������������ ����� ������ �� �����������:"
 
-#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25348,22 +25625,22 @@ msgstr ""
 "���������� %s\n"
 "���������� ����� %d."
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "������ �����"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "������ `%s' �� ����������."
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:552
 msgid "Evolution Error"
 msgstr "������ � Evolution"
 
-#: shell/e-shell-importer.c:504
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25372,11 +25649,11 @@ msgstr ""
 "���� �������� ����� �� �������\n"
 "%s"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "���������"
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25385,17 +25662,17 @@ msgstr ""
 "���������� %s.\n"
 "��������� %s"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "������ ��� ���������� �� %s"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "������ ��� ����������� �� %s"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25404,31 +25681,31 @@ msgstr ""
 "���������� %s\n"
 "���������� ����� 1."
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "�����������"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "��� �� ����:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "������ ����"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "��� �� ����:"
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "������ �� ����� � ��������� �� ����� ��������"
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "������ �� �������� ����"
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25436,32 +25713,32 @@ msgstr ""
 "����, ���������...\n"
 "�������� �� ������������ ���������"
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "�������� ������������ �����������"
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "�� %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "������ �����"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "����� �� ���������� ����� �� ����������� �� ���� �����"
 
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "������"
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "�������� ��������..."
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, fuzzy, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -25470,159 +25747,161 @@ msgstr ""
 "������ ��� '%s':\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 #, fuzzy
 msgid "Syncing Folder"
 msgstr "�������������� �� �����"
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:317
+#: shell/e-shell-offline-sync.c:311
 #, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:345
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "�������� "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:357
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+#, fuzzy
+msgid "Please select a user."
+msgstr "����, �������� ������."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 #, fuzzy
 msgid "Opening Folder"
 msgstr "�������� �� ����� %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "�������� �� ����� %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "������ � %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:455
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "�� ���� �� ����������� �������: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:513
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
 "�� ���� �� ������ ��������� �����:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:159
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"�� ���� �� ������������� mail ����������� �� Evolution.\n"
-"(%s)"
-
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "�� ���� �� ������������� mail ����������� �� Evolution.\n"
-
-#: shell/e-shell-user-creatable-items-handler.c:579
-#: shell/e-shell-user-creatable-items-handler.c:633
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:636
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr "���"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "���� ��� �� �����."
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "� ����� �� ������� �� ���� �� �� ������� ������� 'Return'"
 
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
-msgstr "����� �� ����� �� ���� �� ������� ������"
+#: shell/e-shell-utils.c:129
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "� ����� �� ������� �� ���� �� �� ������� ������� 'Return'"
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "� ����� �� ������� �� ���� �� �� ������� ������� 'Return'"
+
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' � '..' �� �������� ����� �� �����."
 
-#: shell/e-shell-view-menu.c:94
+#: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "����������� GNOME Pilot �������� �� � ���������� �� ���� �������"
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr "������ ��� ���������� �� %s"
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy �� ���� ������ � $PATH."
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "Bug buddy �� ���� �� ���� ���������."
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy �� ���� �� ���� ���������."
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 msgid "About Ximian Evolution"
 msgstr "������� Evolution"
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "����� � �����..."
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr "����� �� ����� ����� ������ �� ��������"
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "������ ���� ���������"
 
-#: shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:618
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "�������� ������� �� ����� ������ �� ���� �����������:"
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "������ � 'O_nline' "
 
-#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr "������ � '_Offline'"
 
-#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr "������ � 'Offline'"
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(���� �������� �����)"
 
-#: shell/e-shell-view.c:1861
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1863
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(����)"
 
-#: shell/e-shell-view.c:1910
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution � ������� � 'online'.  �������� �� ���� ����� �� �� �� ����������� "
 "� ����� 'offline'."
 
-#: shell/e-shell-view.c:1917
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution � � ������ �� ����������� �� ����� 'offline'."
 
-#: shell/e-shell-view.c:1923
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25641,12 +25920,12 @@ msgstr ""
 "�������� �� ���������� �� ��������� �:\n"
 "%s"
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�� ���� �� ������� ��������� ��������� -- %s"
 
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25658,150 +25937,144 @@ msgstr ""
 "�������������\n"
 "�� �� �������� ������ �� ������� ������."
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "������ ���������"
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "�� ���� �� ����������� � OAF"
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "����������������� ���� ����� �� � ��������"
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "�������� ������"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "������� ���� ����� ���������"
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "��� �� �����:"
 
-#: shell/e-shortcuts-view.c:173
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
+#: shell/e-shortcuts-view.c:179
+#, fuzzy, c-format
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
 msgstr ""
 "������������ �� ������ �� �������� �����\n"
 "`%s' �� ������� � ���������?"
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "�� ��������"
-
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "���������� ����� ���������"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "���������� ��������� ����� ��������� ��:"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "����� �����"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "������� ��������� ���� ����� �����"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "��_���� �����"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "������� ��������� ���� ������ �����"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_���� �����..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "������� ���� ����� ���������"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "�_������� ���� �����..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "�������� ���� ����� ���������"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "�_��������� ���� �����..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "���������� ���� ����� ���������"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "�_����� ������� � ���������"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "������ ������� � ���������"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create _Default Shortcuts"
 msgstr "������ ���� ���������"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 #, fuzzy
 msgid "Create Default Shortcuts"
 msgstr "������ ���� ���������"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "���������� ���������"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "���������� ��������� ��������� ��:"
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "������ ������� �������� � ���� ���������"
 
-#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "_������ � ��� ��������"
 
-#: shell/e-shortcuts-view.c:410
+#: shell/e-shortcuts-view.c:417
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "������ ����� �������� � ���� ��������� � ��� ��������"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "_����������"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "����������� ���� ���������"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "��_������"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "������� ���� ��������� �� ������� � ���������"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "������ ��� ��������� �� ���������."
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "���������"
 
@@ -25810,73 +26083,73 @@ msgstr "���������"
 msgid "Checkbox"
 msgstr "����"
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "���� ������"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "����� ��� ������ ��� ���� ����������"
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "���� �� ���������� ����� �� � �������"
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "������/������� ������"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "���� ���������� ������������ �� ����������� �� �����"
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "������� �� � ������"
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "���������� ����� �� � ��������"
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "��������� �� �� �������� � ���� ���������"
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "���������� �� �� �������"
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "���������� ��� �� �� �������� � ���� ���������"
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "���������� ����� �� ���� �� ���� ������������ ��� �������"
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr "�� ���� �� ������ ����� � ���� ���"
 
-#: shell/e-storage.c:599
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-task-widget.c:191
+#: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:196
+#: shell/e-task-widget.c:216
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ����������)"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<��������� ��� �� �� �������� �����>"
 
@@ -25917,84 +26190,81 @@ msgstr ""
 "�������� �� ���������� �� ��������� �:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "������ � CORBA"
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "���������"
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "������ ��������"
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "���� ��� ����������"
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "���� ���������"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "�� � �������"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "���������� ���"
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "����������� �����"
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "����������� ��������"
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "�������� ������"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "�����������"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "������ URI"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "��� ��������"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "���� �����"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "������� ���������� � �����"
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test type"
 msgstr "��� �� ����:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "������� ������"
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "�������� �� ���� �� Evolution."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Click OK to close these connections and go offline"
 msgstr "�������� �� OK �� �� ��������� �������� � �� ��������� � 'offline'"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "����"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr "�������� ������ �� � ������� �������:"
 
@@ -26018,15 +26288,15 @@ msgstr "_����"
 msgid "_Tasks:"
 msgstr "������"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "��� �� �����:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "��� �� �����:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "������� ���� �� ���� ��������� �������:"
 
@@ -26050,29 +26320,30 @@ msgstr "��� �� �����:"
 msgid "_User:"
 msgstr "_������������ ���:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "�������� �� ��������� �� Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "��������� �������"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "������� ����: "
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "����� �����"
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
+#, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 "����� ����� � Evolution. ���������� ������ �� �� ��������\n"
 "�� �������� Evolution � ������ �������� ������, �� �����������\n"
@@ -26080,13 +26351,13 @@ msgstr ""
 "\n"
 "����, �������� �� ������ \"�������\" �� �� ����������."
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
 #, fuzzy
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 "��� ������� ��������� ������ ����������\n"
 "���������� �� ��������� �� Evolution. \n"
@@ -26128,41 +26399,42 @@ msgstr ""
 "� ���� �� ������ ������������ � ������� �� �����������\n"
 "�� ������ ������� � Evolution."
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "���������"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "�� ����������"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "�� �� ����� ������"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution �� ���� �� ��������� ����� �� �������� �������:"
 
-#: shell/main.c:96
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:102
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ���� ������..."
 
-#: shell/main.c:227
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:266
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -26172,79 +26444,114 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:250
+#: shell/main.c:290
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "������� Evolution"
 
-#: shell/main.c:259
+#: shell/main.c:298
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "�� �� ����� ������"
 
-#: shell/main.c:394
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "����� ������ �� Ximian Evolution shell."
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "�� ���� �� ������������� Ximian Evolution shell: %s"
 
-#: shell/main.c:485
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "��������� 'splash' �����"
 
-#: shell/main.c:487
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "�������� ������"
 
-#: shell/main.c:489
+#: shell/main.c:532
 #, fuzzy
 msgid "Start in online mode"
 msgstr "�������� ������������ �����������"
 
-#: shell/main.c:491
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr ""
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr "������� ������ �� ������ �� ������ ���������� ��� ����."
 
-#: shell/main.c:493
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:542
-msgid "Cannot initialize the Bonobo component system."
-msgstr "�� ���� �� ������������� ��������� ���������� �� Bonobo"
-
-#: tools/evolution-addressbook-abuse.c:80
-#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-abuse.c:81
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "������ ��� ����������� �� ������� �����"
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "���� �� �����"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "������ ����"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "���� ��� �� ����"
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "������ ��������...."
+
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:327
+#, fuzzy
+msgid "Description of the attachment."
+msgstr "���������� �� ��������"
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:329
+#, fuzzy
+msgid "Default subject for the message."
+msgstr "������� ��������� ���������"
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "�� ���� �� ����������� �������: %s"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:3
 #, fuzzy
 msgid "Copy Contact(s) to Another Folder..."
@@ -26338,7 +26645,7 @@ msgstr "�������� �����"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr "_��������"
 
@@ -26457,7 +26764,7 @@ msgid "Print this item"
 msgstr "����� �� ���� �����"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "�������"
 
@@ -26484,7 +26791,7 @@ msgstr "������� ���� ����� �� �����"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_����"
 
@@ -26738,7 +27045,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr "_���������"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "�����"
 
@@ -27004,7 +27311,7 @@ msgstr "������� �� ������"
 
 #: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Post a reply to a message message in a Public folder"
+msgid "Post a reply to a message in a Public folder"
 msgstr "������� �� ���� ��������� ��� ������ �����"
 
 #: ui/evolution-mail-message.xml.h:64
@@ -27168,7 +27475,7 @@ msgstr ""
 msgid "_Resend..."
 msgstr "�����������..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "���_��������"
 
@@ -27183,12 +27490,12 @@ msgstr "������� ���� ��������"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Close"
 msgstr "�������"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "_������"
 
@@ -27196,6 +27503,10 @@ msgstr "_������"
 msgid "Attach"
 msgstr "��������"
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "�������� ����"
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "������� �������� ����"
@@ -27366,7 +27677,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "������� ������� � ������� �������"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr "_�����"
 
@@ -27553,128 +27864,118 @@ msgstr "��������� �� Pilot..."
 
 #: ui/evolution.xml.h:27
 #, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "��������� �� Pilot..."
-
-#: ui/evolution.xml.h:28
-#, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "������ ���� �����..."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "��������� / ����������"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "������� �������� �� ���� � �������� ����"
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "Mail ������������"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Mail ������������"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "������ ���������� �� Ximian ��������"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "������� ������ �� ������"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "������� ������ �� ������"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "������� ������ �� ������ ���� ��� ����"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "���������"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "��������� ����������� �� ������ � �������"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "��������� ����������� �� ������ � ������������"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "��������� ������ ��/��-����"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "������ ��������� �����"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "������� Ximian ��������..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "�������..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "����� � �����"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Folder..."
 msgstr "�����"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "����� � �����..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "�����..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "��������..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "���"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "���� �����"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "������ ���� �����..."
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "�����������..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "��������� / ����������"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "����� � ����������"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "���������"
@@ -27761,9 +28062,8 @@ msgstr "� ���������"
 msgid "_Tasks"
 msgstr "_������"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr "UTC"
 
@@ -27789,21 +28089,21 @@ msgstr ""
 "�������� ��������� ����.\n"
 "����� ����� ��������."
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "_����� �������"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:357
+#: widgets/menus/gal-view-menus.c:350
 #, fuzzy
 msgid "Custom View"
 msgstr "_����� �������"
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "������ ��������"
 
@@ -27814,19 +28114,19 @@ msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1070
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "����"
 
-#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr "����"
 
-#: widgets/misc/e-cell-date-edit.c:797
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "������ ������ �� � �������� � ������� ������: %s"
@@ -27835,81 +28135,81 @@ msgstr "������ ������ �� � �������� � ������� ������: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "���������� �� ���������� ������ �� � ����� 0 � 100, �����������"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "��������"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "�������� ������"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "��������"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "��������"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "������"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "�������"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "��������"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "������"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "������"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "������� ������"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "�����������"
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr "��������"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "���������"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 #, fuzzy
 msgid "Visual"
 msgstr "�������"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "���������� ������ �������: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "�������� ������ ������� �� ����������"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "�����..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "���������"
 
@@ -27917,11 +28217,12 @@ msgstr "���������"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "�������� �� �������"
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "������ �������"
 
@@ -27940,66 +28241,523 @@ msgstr "������ � ���������� ��������"
 msgid "_Advanced..."
 msgstr "������������..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "����������"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "������"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "������"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "���������"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "�� �������� ���� ��������� ������."
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "�������"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 #, fuzzy
 msgid "_Find Now"
 msgstr "������ ����"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "�������"
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:833
+msgid "Item ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:840
+msgid "Subitem ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:847
+#, fuzzy
+msgid "Text"
+msgstr "����"
+
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "�������"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "������ ����"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "������ �� ������������ ������� �����"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "��������� �� ��������� �� ����� � ��������� ����� �� ��������"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "������ �� ���������� ��������; ������� �� ��������"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "�������� �� Evolution iTip/iMip �������"
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): �� ���� �� ������������� GNOME-VFS"
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "��������� �� ��������� �� ����� � ��������� ����� �� ��������"
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): �� ���� �� ������������� GNOME"
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "�������, �� ����� �� �� ������ LDIF ������� � ��������."
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "����� LDIF ������� � ��������."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "�������, �� ����� �� �� ������ VCard ������� � ��������."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "����� VCard ������� � ��������."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "������� �� Bonobo �� ������� ���������."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "������� �� Bonobo �� ��������� �� �����."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "����� ������� �� Bonobo ����� ������� ������� �����."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "������� �� ����������� �� Evolution "
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "��������� �� Evolution �� �������� �� ��������"
+
+#, fuzzy
+#~ msgid ""
+#~ "Factory for the configuration controls for the Evolution Addressbook."
+#~ msgstr "������� �� ����������� �� Evolution "
+
+#, fuzzy
+#~ msgid "380"
+#~ msgstr "80%"
+
+#, fuzzy
+#~ msgid "<- _Remove"
+#~ msgstr "�����"
+
+#, fuzzy
+#~ msgid "<< Fewer Options"
+#~ msgstr "�����"
+
+#, fuzzy
+#~ msgid "DN Customization"
+#~ msgstr "���� ����������"
+
+#, fuzzy
+#~ msgid "Evolution Attribute"
+#~ msgstr "������ �� Evolution."
+
+#, fuzzy
+#~ msgid "Mappings"
+#~ msgstr "������"
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "������ ������"
+
+#, fuzzy
+#~ msgid "_Add ->"
+#~ msgstr "�_�����"
+
+#, fuzzy
+#~ msgid "_Add Mapping"
+#~ msgstr "������ ��������"
+
+#, fuzzy
+#~ msgid "_Add to DN"
+#~ msgstr "������ ��������"
+
+#, fuzzy
+#~ msgid "_Always"
+#~ msgstr "������"
+
+#, fuzzy
+#~ msgid "_Delete Mapping"
+#~ msgstr "������� _������"
+
+#, fuzzy
+#~ msgid "_Edit Mapping"
+#~ msgstr "_���������� �����"
+
+#, fuzzy
+#~ msgid "_Evolution attribute:"
+#~ msgstr "������ �� Evolution."
+
+#, fuzzy
+#~ msgid "_More Options >>"
+#~ msgstr "_�����"
+
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "������ %d"
+
+#, fuzzy
+#~ msgid "account-editor"
+#~ msgstr "�������� �� ��������"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "������� �� ��������� �� ����� � ��������� ����� �� ��������"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "���������� ����������"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "���������� ������ � ��������"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d �� �� ��������)"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "�_�������..."
+
+#~ msgid "Phone Types"
+#~ msgstr "��� �������"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "��������� �� �������?"
+
+#, fuzzy
+#~ msgid "Display Cards?"
+#~ msgstr "�������"
+
+#, fuzzy
+#~ msgid "Display Cards"
+#~ msgstr "�������"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "������� �� Bonobo ����� ������� ������ ������"
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "����� ������� �� Bonobo �������� ��������."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "������� �� ����������� �� Evolution "
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "��������� �� Evolution �� �������� �� ��������"
+
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "������� �� ������� �� ������ � Evolution"
+
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "������� �� ����� ������� �� ��������"
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "�� ���� �� ������������� GNOME"
+
+#, fuzzy
+#~ msgid "st"
+#~ msgstr "1��"
+
+#, fuzzy
+#~ msgid "nd"
+#~ msgstr "2��"
+
+#, fuzzy
+#~ msgid "rd"
+#~ msgstr "3��"
+
+#, fuzzy
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "�� ���� �� ������������� Bonobo"
+
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "�� ���� �� ������ ������� �� ��������� �� ���������"
+
+#~ msgid "Print Calendar"
+#~ msgstr "��������� ��������"
+
+#~ msgid ""
+#~ "Could not create the tasks view.  Please check your ORBit and OAF setup."
+#~ msgstr ""
+#~ "�� ���� �� ������ ������ �� ������. ���� ��������� ����������� �� ORBit � "
+#~ "OAF"
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolution ��� �������� ����� ���� ��� ������ ����� �������� � ����������� "
+#~ "�� ������� � ������ ����� ��� ������."
+
+#~ msgid ""
+#~ "Evolution has tried to take the tasks that were in your calendar folder "
+#~ "and migrate them to the new tasks folder.\n"
+#~ "Some of the tasks could not be migrated, so this process may be attempted "
+#~ "again in the future."
+#~ msgstr ""
+#~ "Evolution �� ����� �� ����� �������� ����� ���� ��� ������ ����� �������� "
+#~ "� ����������� �� ������� � ������ ����� ��� ������.\n"
+#~ "����� �� ��� �� ����� �� ����� ���������, ���� �� ������� ���� �� "
+#~ "�������� ������ ��-�������."
+
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "������ ������ �� ��������� �� `%s' �� �� �������; ���� ����� �� ������� "
+#~ "�� �������� �� ���� �������� � ������� ��� ������"
+
+#, fuzzy
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "�������, �� ����� �� �� ������ VCard ������� � ��������."
+
+#, fuzzy
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "����� VCard ������� � ��������."
+
+#, fuzzy
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "����� VCard ������� � ��������."
+
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr ""
+#~ "�� ���� �� ������ ���������  %s �� ����� %s\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "�� ���� �� �� ������ ��� ��������� %s"
+
+#~ msgid "Warning!"
+#~ msgstr "��������!"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "�� ���� �� ������������� ��������� �� Evolution"
+
+#~ msgid "minute"
+#~ msgstr "������"
+
+#~ msgid "hour"
+#~ msgstr "���"
+
+#~ msgid "week"
+#~ msgstr "�������"
+
+#~ msgid "year"
+#~ msgstr "������"
+
+#~ msgid "Add action"
+#~ msgstr "������ ��������"
+
+#~ msgid "Add criterion"
+#~ msgstr "������ ��������"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "������� �� ����������� �� Evolution "
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "������� �� ������� �� ������ � Evolution"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "������� �� ����������� �� Evolution "
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "������� �� ����������� �� Evolution "
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "��������� �� Evolution �� �������� �� ����."
+
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "������� �� ����������� �� Evolution "
+
+#, fuzzy
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "��������������: ������������ ���������"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
+
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr ""
+#~ "�� ���� �� ������������� mail ����������� �� Evolution �� �������������."
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "�� ���� �� ������������� mail ����������� �� Evolution �� ����."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "������� �� ������ �� mbox � Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "����������� mbox ������� � Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "������� �� ����������� �� Outlook Express 4 ���� � Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "����������� Outlook Express 4 ������� � Evolution"
+
+#~ msgid "Really delete account?"
+#~ msgstr "������������ �� �� ������ �������?"
+
+#, fuzzy
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "������� ���������� ����������� ���������"
+
+#~ msgid "US-Letter"
+#~ msgstr "US-�����"
+
+#, fuzzy
+#~ msgid "Add Signature"
+#~ msgstr "������� ���������"
+
+#~ msgid "Account %d"
+#~ msgstr "������ %d"
+
+#, fuzzy
+#~ msgid "_Variable-width:"
+#~ msgstr "����������"
+
+#~ msgid "All folders"
+#~ msgstr "������ �����"
+
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "�����"
+
+#, fuzzy
+#~ msgid "Display Options"
+#~ msgstr "����� �� �������"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "����� ������� �� ����� �������� �:"
+
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "������ ����"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "������� ������� ��������� �� Evolution"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr "������� �� ����������� �� Evolution "
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "������� �� ����������� �� Evolution "
+
+#~ msgid "Evolution installation"
+#~ msgstr "���������� �� Evolution"
+
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "������ ������ �� �������� ������ �� ��������� ������������ �������\n"
+#~ "� ������ ����� ���������� �� ��������"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "����, �������� �� \"OK\" �� �� ����������� ��������� , ��� \"��������\" "
+#~ "�� �� ��������."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "�� ���� �� ������ ����������\n"
+#~ "%s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Directory %s\n"
+#~ "does not have the right permissions. Please make it\n"
+#~ "readable and executable and restart Evolution."
+#~ msgstr ""
+#~ "������������ %s\n"
+#~ "���� ������������ �����. ���� ��������� �\n"
+#~ "�� ������ � ���������� � �������������� Evolution."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "����� %s\n"
+#~ "������ �� ���� ������ �� �� ���� Evolution �� ������ ��������.\n"
+#~ "����, ���������� ���� ���� � �������������� Evolution."
+
+#~ msgid "New..."
+#~ msgstr "���..."
+
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "�� ���� �� ������������� mail ����������� �� Evolution.\n"
+#~ "(%s)"
+
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "�� ���� �� ������������� mail ����������� �� Evolution.\n"
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "����� �� ����� �� ���� �� ������� ������"
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Bug buddy �� ���� ������ � $PATH."
+
+#~ msgid "Don't remove"
+#~ msgstr "�� ��������"
+
+#~ msgid "Active connections"
+#~ msgstr "������� ������"
+
+#~ msgid "Host"
+#~ msgstr "����"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "�� ���� �� ������������� ��������� ���������� �� Bonobo"
+
+#~ msgid "Output File"
+#~ msgstr "������ ����"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "��������� �� Pilot..."
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Mail ������������"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "������ �� ������������ ������� �����"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "������ �� ���������� ��������; ������� �� ��������"
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): �� ���� �� ������������� GNOME-VFS"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): �� ���� �� ������������� GNOME"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 
 #, fuzzy
 #~ msgid "_Configure..."
@@ -28035,9 +28793,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "Copy selected messages"
 #~ msgstr "������ ��������� ���������"
 
-#~ msgid "Cut selected messages"
-#~ msgstr "������� ��������� ���������"
-
 #, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "�����"
@@ -28078,9 +28833,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ "��������� �� � �����.\n"
 #~ "�������� 5 ������� � ������� ������."
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "�������� �� ����������� �� Evolution"
-
 #, fuzzy
 #~ msgid "_Preferences..."
 #~ msgstr "_���� ����������"
@@ -28194,9 +28946,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "You have chosen an invalid date."
 #~ msgstr "������� ��� ��������� ����."
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolution - �������� �� ������"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "������� �� ���, �� ������ �� �������� ���� ������?"
 
@@ -28211,9 +28960,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "News Servers"
 #~ msgstr "������"
 
-#~ msgid "Source"
-#~ msgstr "��������"
-
 #~ msgid "Source Information"
 #~ msgstr "�������� �� ����������"
 
@@ -28372,10 +29118,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgstr "_����������"
 
 #, fuzzy
-#~ msgid " New "
-#~ msgstr "���"
-
-#, fuzzy
 #~ msgid "Advanced Options"
 #~ msgstr "�������� ����������"
 
@@ -28682,9 +29424,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "New Contact _List"
 #~ msgstr "��� ������ � ��������"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "���������� ��������� �����"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "������ ������� �����"
 
@@ -28945,9 +29684,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "Regions"
 #~ msgstr "�������"
 
-#~ msgid "Al_l stations:"
-#~ msgstr "������ �������"
-
 #~ msgid "All _folders:"
 #~ msgstr "������ �����"
 
@@ -28966,9 +29702,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "(No name)"
 #~ msgstr "(���� ���)"
 
-#~ msgid "New List"
-#~ msgstr "��� ������"
-
 #~ msgid "Configure the calendar's settings"
 #~ msgstr "������������� ����������� �� ��������"
 
diff --git a/po/ca.po b/po/ca.po
index 18a5c38995..c8c5081cce 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.0.6\n"
-"POT-Creation-Date: 2002-10-28 16:49-0500\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2000-11-01 00:40+0100\n"
 "Last-Translator: Quico Llach <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <linux@softcatala.org>\n"
@@ -15,43 +15,54 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Evolution LDIF importer"
+msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-msgid "Imports LDIF files into Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 #, fuzzy
 msgid "File As"
 msgstr "Arxiva com:"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nom"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #, fuzzy
 msgid "Email"
 msgstr "Adre�a electr�nica 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Primari"
 
@@ -62,16 +73,17 @@ msgstr "Primari"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Feina"
 
@@ -82,12 +94,12 @@ msgid "Bus"
 msgstr "Ocupat"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Crida de retorn"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Empresa"
 
@@ -99,12 +111,13 @@ msgstr "Copia"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Particular"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organitzaci�"
@@ -115,18 +128,18 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "M�bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "Cotxe"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax de la feina"
@@ -137,13 +150,13 @@ msgid "Bus Fax"
 msgstr "Fax de la feina"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax particular"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Feina 2"
 
@@ -153,43 +166,43 @@ msgid "Bus 2"
 msgstr "Ocupat"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Particular 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "XDSI"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Altres"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Un altre fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Busca"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "R�dio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "T�lex"
@@ -201,15 +214,15 @@ msgid "TTY"
 msgstr "TTY/TDD"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Adre�a electr�nica 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Adre�a electr�nica 3"
@@ -234,6 +247,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 #, fuzzy
 msgid "Office"
@@ -245,6 +259,7 @@ msgid "Off"
 msgstr "_Oficina"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 #, fuzzy
 msgid "Title"
@@ -261,6 +276,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 #, fuzzy
 msgid "Manager"
@@ -276,6 +292,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 #, fuzzy
 msgid "Nickname"
@@ -287,18 +304,21 @@ msgid "Nick"
 msgstr "_Sobrenom:"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1418
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 #, fuzzy
 msgid "Spouse"
 msgstr "_C�njuge:"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1459
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 #, fuzzy
 msgid "Note"
 msgstr "Cap"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Agenda"
@@ -318,273 +338,368 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:100
 #, fuzzy
+msgid "Default server calendar"
+msgstr "Desa l'agenda"
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "Agenda"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
+#, fuzzy
 msgid "Anniversary"
 msgstr "Ani_versari:"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 #, fuzzy
 msgid "Birth Date"
 msgstr "Data d'ini_ci:"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 #, fuzzy
 msgid "Categories"
 msgstr "categories"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 #, fuzzy
 msgid "Family Name"
 msgstr "Nom complet:"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "Cotxe"
+
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
-#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-card-simple.c:893
 #: addressbook/backend/ebook/e-destination.c:706
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Contacte _nou"
 
-#: addressbook/backend/ebook/e-card.c:2683
+#: addressbook/backend/ebook/e-card.c:1308
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 #, fuzzy
-msgid "Multiple VCards"
-msgstr "Mou el missatge"
+msgid "Full Name"
+msgstr "Nom complet:"
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, fuzzy, c-format
-msgid "VCard for %s"
-msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Adre�a:"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "Adre�a"
+
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "Cap"
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "Data d'ini_ci:"
+
+#: addressbook/backend/ebook/e-card.c:1355
+#: calendar/gui/e-calendar-table.etspec.h:19
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
+#: addressbook/backend/ebook/e-card.c:1369
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Organitzaci�"
+
+#: addressbook/backend/ebook/e-card.c:1390
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#, fuzzy
+msgid "Role"
+msgstr "M�bil"
+
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+#, fuzzy
+msgid "Mailer"
+msgstr "_Correu"
+
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "Imprimeix el missatge"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Agenda"
+
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Voleu suprimir el contacte?"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-#: addressbook/backend/ebook/load-pine-addressbook.c:22
-#: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
-#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/e-card.c:1480
+#, fuzzy
+msgid "Category List"
+msgstr "categories"
+
+#: addressbook/backend/ebook/e-card.c:1487
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1494
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1501
+#, fuzzy
+msgid "List"
+msgstr "�s"
+
+#: addressbook/backend/ebook/e-card.c:1508
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Comprova l'adre�a"
+
+#: addressbook/backend/ebook/e-card.c:1515
+#, fuzzy
+msgid "Arbitrary"
+msgstr "Primari"
+
+#: addressbook/backend/ebook/e-card.c:1522
+#, fuzzy
+msgid "ID"
+msgstr "Si"
+
+#: addressbook/backend/ebook/e-card.c:1529
+#, fuzzy
+msgid "Last Use"
+msgstr "Enganxa"
+
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "Puntuaci�"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:2978
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 #, fuzzy
 msgid "Searching..."
 msgstr "Cerca"
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 #, fuzzy
 msgid "Loading..."
 msgstr "_Par�metres"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "Nom d'usuari:"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "Adre�a electr�nica:"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1572
-#: addressbook/backend/pas/pas-backend-ldap.c:1575
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 #, fuzzy
 msgid "Error performing search"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 #, fuzzy
 msgid "Default Sync Address:"
 msgstr "Adre�a electr�nica:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el wombat"
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaci� d'adre�a del Pilot"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Configure access to LDAP directory servers here"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#, fuzzy
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-"Utilitat de configuraci� per al conducte de la llibreta d'adreces de "
-"l'Evolution\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 #, fuzzy
 msgid "Directory Servers"
 msgstr "N_ou servidor de directori"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 #, fuzzy
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+msgid "Evolution Addressbook"
+msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Configuraci� del _correu..."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #, fuzzy
-msgid "Factory for the Addressbook Minicard control"
+msgid "Evolution Addressbook address pop-up"
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 #, fuzzy
-msgid "Factory for the Addressbook's address popup"
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Evolution Addressbook card viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 #, fuzzy
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Evolution Addressbook component"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 #, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "Feu clic aqu� per a la llibreta d'adreces"
+msgid "Evolution Addressbook folder viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:611
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1067
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 #, fuzzy
 msgid "Contacts"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 #, fuzzy
 msgid "Folder containing contact information"
 msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public Contacts"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public folder containing contact information"
 msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 #, fuzzy
 msgid "New Contact"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 #, fuzzy
 msgid "_Contact"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Crea un nou contacte"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "New Contact List"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Crea un nou contacte"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr ""
@@ -592,7 +707,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -600,75 +715,65 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:648
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1193
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: addressbook/gui/component/addressbook-config.c:1630
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 #, fuzzy
 msgid "Account Name"
 msgstr "cont�"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 #, fuzzy
 msgid "Server Name"
 msgstr "Servidor:"
 
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
+#: addressbook/gui/component/addressbook-config.c:1676
 #, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 #, fuzzy
 msgid "Other Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "No es pot obrir la llibreta d'adreces"
-
-#: addressbook/gui/component/addressbook.c:480
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -676,19 +781,22 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:537
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
 "is unreachable."
 msgstr ""
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:582
+#: addressbook/gui/component/addressbook.c:557
+msgid "Unable to open addressbook"
+msgstr "No es pot obrir la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -696,41 +804,41 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:633
-#: addressbook/gui/component/addressbook.c:636
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 #, fuzzy
 msgid "Name begins with"
 msgstr "acaba amb"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 #, fuzzy
 msgid "Email begins with"
 msgstr "acaba amb"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "categories"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 #, fuzzy
 msgid "Any field contains"
 msgstr "El cos cont�"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 #, fuzzy
 msgid "Advanced..."
 msgstr "Afegeix..."
 
-#: addressbook/gui/component/addressbook.c:956
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -738,7 +846,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:962
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -746,26 +854,26 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:968
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:975
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1050
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
 #, fuzzy
 msgid "Any Category"
 msgstr "categories"
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que mostrar� el navegador de carpetes"
 
@@ -774,144 +882,131 @@ msgstr "L'URI que mostrar� el navegador de carpetes"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 #, fuzzy
 msgid "(none)"
 msgstr "(Sense nom)"
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/component/e-address-popup.c:478
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "Adre�a electr�nica principal"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 #, fuzzy
 msgid "Select an Action"
 msgstr "Fitxer de signatura:"
 
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:622
 #, fuzzy, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Crea un nou contacte"
 
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 #, fuzzy
 msgid "Querying Addressbook..."
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "Adre�a electr�nica:"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 #, fuzzy
 msgid "Disable Queries"
 msgstr "Categories disponibles:"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "Detecta els tipus suportats..."
 
-#: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "1234"
-msgstr "123"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-msgid "1:00"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:4
-msgid "2:30"
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:5
-msgid "3268"
+msgid "1:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:6
-msgid "380"
+msgid "2:30"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
-msgid "389"
+msgid "3268"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
+msgid "389"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "636"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "666"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "<- _Remove"
-msgstr "<< Elimina"
+msgid "Add LDAP Server"
+msgstr "Servidor LDAP:"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "<< Fewer Options"
-msgstr "Opcions"
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:14
-#, fuzzy
 msgid "Addressbook Sources"
 msgstr "Afegeix una font"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always"
 msgstr "Alarmes"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -920,81 +1015,62 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Connecting"
 msgstr "S'est� recollint el correu des de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
-msgid "DN Customization"
-msgstr "Cerca personalitzada"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "De_lete"
 msgstr "Suprimeix"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "Nom d'usuari:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
-msgid "Email Address:"
-msgstr "Adre�a electr�nica:"
+msgid "Edit LDAP Server"
+msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
-msgid "Evolution Attribute"
-msgstr "Evolution"
+msgid "Email Address:"
+msgstr "Adre�a electr�nica:"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Finished"
 msgstr "Cerca"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-#, fuzzy
-msgid "LDAP Attribute"
-msgstr "Autenticaci�:"
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "LDAP Configuration Assistant"
 msgstr "Configuraci� del correu"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Mappings"
-msgstr "Marges"
-
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -1004,76 +1080,36 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:41
-#, fuzzy
-msgid "Objectclasses"
-msgstr "_Objecte"
-
-#: addressbook/gui/component/ldap-config.glade.h:42
-msgid "Objectclasses Used in Evolution:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses Used on Server:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-#, fuzzy
-msgid "R_estore Defaults"
-msgstr "Valors predeterminats"
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-#, fuzzy
-msgid "Re_store Defaults"
-msgstr "Valors predeterminats"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Cerca"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
-#: calendar/gui/e-week-view.c:1240
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 #, fuzzy
 msgid "Searching"
 msgstr "Cerca"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
-msgid "Select"
-msgstr "Selecciona'ls _tots"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Suprimeix"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -1084,7 +1120,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1093,56 +1129,49 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Cap informaci�"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Connexi� de prova a \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 4: Display Name"
 msgstr "Fes un so en visualitzar les alarmes"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Sub"
 msgstr "Dg"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Seleccioneu una carpeta"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1150,7 +1179,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1159,7 +1188,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1167,17 +1196,17 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
 "directory tree. A search scope of \"sub\" will include all entries below "
 "your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1187,34 +1216,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1222,88 +1251,46 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "Using email address"
 msgstr "Adre�a electr�nica:"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:108
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Afegeix"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-#, fuzzy
-msgid "_Add ->"
-msgstr "Afegeix >>"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-#, fuzzy
-msgid "_Add Mapping"
-msgstr "Afegeix una acci�"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-#, fuzzy
-msgid "_Add to DN"
-msgstr "Afegeix una acci�"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-#, fuzzy
-msgid "_Always"
-msgstr "Alarmes"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "_Suprimeix"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Visualitzaci�"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Distinguished Name (DN):"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_Don't use SSL/TLS"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1313,220 +1300,159 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Edita"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "Edita una cita"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-#, fuzzy
-msgid "_Evolution attribute:"
-msgstr "Evolution"
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_If necessary "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "_LDAP attributes:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-#, fuzzy
-msgid "_More Options >>"
-msgstr "_Opcions"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "_Port number:"
 msgstr "N�mero de port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
-#, fuzzy
-msgid "_Restore Defaults"
-msgstr "Valors predeterminats"
-
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Search base:"
 msgstr "Cerca"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "_Server name:"
 msgstr "Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Durada de l'snooze (minuts)"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
-#, fuzzy
-msgid "account-druid"
-msgstr "cont�"
-
-#: addressbook/gui/component/ldap-config.glade.h:132
-#, fuzzy
-msgid "account-editor"
-msgstr "Contacta l'editor"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "cards"
 msgstr "No iniciat"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "connecting-tab"
 msgstr "S'est� recollint el correu des de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:136
-msgid "edit_server_window_simple"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:97
 #, fuzzy
 msgid "general-tab"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:139
-msgid "objectclasses-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "searching-tab"
 msgstr "Cerca"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Evolution's addressbook name selection interface."
+msgid "Evolution Addressbook name selection interface"
 msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+#, fuzzy
+msgid "Remove All"
+msgstr "Elimina"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:699
-#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
-#: shell/e-shortcuts-view.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Elimina"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
-msgid "Remove All"
-msgstr "Elimina"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
-#, fuzzy
-msgid "Send HTML Mail?"
-msgstr "Sendmail"
+msgid "View Contact List"
+msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
-msgid "Edit Contact List"
-msgstr "_Contactes..."
+msgid "View Contact Info"
+msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
 #, fuzzy
-msgid "Unnamed Contact List"
-msgstr "Contacte _nou"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
-msgstr ""
+msgid "Send HTML Mail?"
+msgstr "Sendmail"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+msgid "Source"
+msgstr "Font"
+
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:564
+#: addressbook/gui/component/select-names/e-select-names.c:648
 #, fuzzy
 msgid "Find contact in"
 msgstr "Cerca un contacte"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Find"
+msgstr "Cerca"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Seleccioneu els noms"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 #, fuzzy
 msgid "Selected Contacts:"
 msgstr "Voleu suprimir el contacte?"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 #, fuzzy
 msgid "Show Contacts"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid ""
 "Type a name into the entry, or\n"
 "select one from the list below:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 #, fuzzy
 msgid "_Category:"
 msgstr "categories"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 #, fuzzy
 msgid "_Folder:"
 msgstr "_Carpeta"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "A_ssistant's name:"
 msgstr "_Nom de l'assistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 #, fuzzy
 msgid "Add_ress..."
 msgstr "_Adre�a..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "Ani_versari:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
 msgid "Birthda_y:"
 msgstr "_Data de naixement:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "C_ontactes..."
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegories..."
@@ -1537,7 +1463,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Contacta l'editor"
 
@@ -1547,7 +1473,7 @@ msgid "D_epartment:"
 msgstr "_Departament:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "Detalls"
 
@@ -1590,1382 +1516,1427 @@ msgstr "Organitzaci�:"
 msgid "P_rofession:"
 msgstr "_Professi�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Tipus de tel�fon"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "S_pouse:"
 msgstr "_C�njuge:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "This is the _mailing address"
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Wants to receive _HTML mail"
 msgstr "Vol rebre correu _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
-#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
-#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "_C�rrec:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "_Nom del gestor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "_Sobrenom:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Oficina"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "_Public Calendar URL:"
 msgstr "Agenda"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "_Web page address:"
 msgstr "Adre�a de p�gina web:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:183
+#, fuzzy
+msgid "Editable"
+msgstr "Filtres d'edici�"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 #, fuzzy
 msgid "United States"
 msgstr "Mou el missatge"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 #, fuzzy
 msgid "Afghanistan"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 #, fuzzy
 msgid "Antarctica"
 msgstr "Tria autom�tica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:120
 #, fuzzy
 msgid "Argentina"
 msgstr "Orientaci�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 #, fuzzy
 msgid "Austria"
 msgstr "agost"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 #, fuzzy
 msgid "Belarus"
 msgstr "anys"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #: my-evolution/Locations.h:218
 #, fuzzy
 msgid "Belize"
 msgstr "Mida"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 #, fuzzy
 msgid "Benin"
 msgstr "S'est� enviant \"%s\""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 #, fuzzy
 msgid "Brazil"
 msgstr "_Correu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Burkina Faso"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Canad�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 #, fuzzy
 msgid "Chad"
 msgstr "Cotxe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 #, fuzzy
 msgid "Chile"
 msgstr "_Fitxer"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 #, fuzzy
 msgid "China"
 msgstr "Cotxe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 #, fuzzy
 msgid "Comoros"
 msgstr "Colors"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #, fuzzy
 msgid "Congo"
 msgstr "S'est� copiant"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finl�ndia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 #, fuzzy
 msgid "France"
 msgstr "Cancel�lat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 #, fuzzy
 msgid "Germany"
 msgstr "maig"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 #, fuzzy
 msgid "Greece"
 msgstr "setmana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 #, fuzzy
 msgid "Greenland"
 msgstr "Finl�ndia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 #, fuzzy
 msgid "Grenada"
 msgstr "Canad�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 #, fuzzy
 msgid "Guam"
 msgstr "am"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 #, fuzzy
 msgid "Guinea"
 msgstr "General"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:888
 #, fuzzy
 msgid "Haiti"
 msgstr "_Correu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 #: my-evolution/Locations.h:945
 #, fuzzy
 msgid "Honduras"
 msgstr "Hores"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 #, fuzzy
 msgid "Hungary"
 msgstr "Diumenge"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 #, fuzzy
 msgid "Italy"
 msgstr "avui"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 #, fuzzy
 msgid "Laos"
 msgstr "Baixa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 #, fuzzy
 msgid "Lesotho"
 msgstr "Baixa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #: my-evolution/Locations.h:1217
 #, fuzzy
 msgid "Liberia"
 msgstr "abril"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #: my-evolution/Locations.h:1233
 #, fuzzy
 msgid "Lithuania"
 msgstr "vuit�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 #, fuzzy
 msgid "Macau"
 msgstr "mar�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 #, fuzzy
 msgid "Malawi"
 msgstr "_Correu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 #, fuzzy
 msgid "Mali"
 msgstr "_Correu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #: my-evolution/Locations.h:1296
 #, fuzzy
 msgid "Malta"
 msgstr "_Correu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 #, fuzzy
 msgid "Martinique"
 msgstr "Minut"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 #, fuzzy
 msgid "Mauritius"
 msgstr "Marges"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 #, fuzzy
 msgid "Mayotte"
 msgstr "Dilluns"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Moldova, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 #, fuzzy
 msgid "Monaco"
 msgstr "Dilluns"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 #, fuzzy
 msgid "Mozambique"
 msgstr "M�bil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 #, fuzzy
 msgid "Myanmar"
 msgstr "Busca"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #, fuzzy
 msgid "Nepal"
 msgstr "Recupera el correu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Netherlands"
 msgstr "Selecciona'ls _tots"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 #, fuzzy
 msgid "New Caledonia"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 #, fuzzy
 msgid "New Zealand"
 msgstr "Recupera el correu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 #, fuzzy
 msgid "Niger"
 msgstr "Alta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #, fuzzy
 msgid "Nigeria"
 msgstr "abril"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #, fuzzy
 msgid "Niue"
 msgstr "Minut"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Norway"
 msgstr "Ara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
 #, fuzzy
 msgid "Pakistan"
 msgstr "Enganxa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
 #, fuzzy
 msgid "Panama"
 msgstr "Canad�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Peru"
 msgstr "Paper"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poland"
 msgstr "Finl�ndia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 #, fuzzy
 msgid "Portugal"
 msgstr "Vertical"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
 #, fuzzy
 msgid "Qatar"
 msgstr "despr�s de"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 #, fuzzy
 msgid "Reunion"
 msgstr "Seccions:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 #, fuzzy
 msgid "Rwanda"
 msgstr "Canad�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Vincent And The Grena-dines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 #, fuzzy
 msgid "Samoa"
 msgstr "Puntuaci�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "San Marino"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #, fuzzy
 msgid "Senegal"
 msgstr "General"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 #, fuzzy
 msgid "Seychelles"
 msgstr "Seleccioneu una carpeta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 #, fuzzy
 msgid "Somalia"
 msgstr "Normal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 #, fuzzy
 msgid "Spain"
 msgstr "_Envia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #, fuzzy
 msgid "Sudan"
 msgstr "dg."
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
 #, fuzzy
 msgid "Suriname"
 msgstr "_Sobrenom:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 #, fuzzy
 msgid "Swaziland"
 msgstr "Finl�ndia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 #, fuzzy
 msgid "Sweden"
 msgstr "Vist"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Taiwan"
 msgstr "R�dio"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 #, fuzzy
 msgid "Tajikistan"
 msgstr "Tasques"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Tanzania, United Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 #, fuzzy
 msgid "Thailand"
 msgstr "Finl�ndia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #, fuzzy
 msgid "Togo"
 msgstr "Per a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 #, fuzzy
 msgid "Tonga"
 msgstr "Avui"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turkey"
 msgstr "dm."
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 #, fuzzy
 msgid "Turkmenistan"
 msgstr "Tasca"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 #, fuzzy
 msgid "Uganda"
 msgstr "Canad�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
 #, fuzzy
 msgid "Viet Nam"
 msgstr "Seleccioneu els noms"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Virgin Islands, British"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Virgin Islands, U.S."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 #, fuzzy
 msgid "Yemen"
 msgstr "Vist"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zimbabwe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:459
 #, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
+msgid "Book"
+msgstr "Cos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "Voleu suprimir el contacte?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
+#, fuzzy
+msgid "Card"
+msgstr "Cotxe"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+#, fuzzy
+msgid "Is New Card"
+msgstr "Nou"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#, fuzzy
+msgid "Writable Fields"
+msgstr "Carpetes virtuals"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "Cotxe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 #, fuzzy
 msgid "Category editor not available."
 msgstr "No hi ha cap resum disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:833
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "El(s) element(s) pertanyen a aquestes categories:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "Desa com a VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2440
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 #, fuzzy
 msgid "Edit Full"
 msgstr "Filtres d'edici�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-#, fuzzy
-msgid "Full Name"
-msgstr "Nom complet:"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 #, fuzzy
 msgid "E-mail"
 msgstr "Adre�a electr�nica 2"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "Error en desar el fitxer: %s"
+
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 #, fuzzy
 msgid "list"
 msgstr "�s"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:221
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/file-exists.glade.h:1
-msgid "Confirm Overwrite"
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:2
-msgid "Don't bother translating this string.  It's not used."
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 #, fuzzy
 msgid "Overwrite"
 msgstr "Voleu sobreescriure el fitxer?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adre�a _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Comprova l'adre�a"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Pa�_s:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adre�a:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "_Poblaci�:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Apartat de correus:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Comarca:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_Codi postal:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "Comprova el nom complet"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Dr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "Esq."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 #, fuzzy
 msgid "I"
 msgstr "Si"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 #, fuzzy
 msgid "Miss"
 msgstr "�s"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Primer:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_�ltim:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Mig:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Sufix:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_T�tol:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #, fuzzy
 msgid "List _name:"
 msgstr "Nom d'usuari:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 #, fuzzy
 msgid "Members"
 msgstr "desembre"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 #, fuzzy
 msgid "_Remove"
 msgstr "Elimina"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 #, fuzzy
 msgid "contact-list-editor"
 msgstr "Contacta l'editor"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "Nou"
+
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Contacta l'editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Desa com a VCard"
@@ -3020,296 +2991,319 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:153
+#. FIXME: get the toplevel window...
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: widgets/misc/e-filter-bar.c:148
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Afegeix..."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Cerca"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 #, fuzzy
 msgid "No cards"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 #, fuzzy
 msgid "1 card"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr " segons"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:408
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:466
+#, fuzzy
+msgid "Query"
+msgstr "maig"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Error en carregar el fitxer: %s"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#, fuzzy
+msgid "Model"
+msgstr "M�bil"
+
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
-#: addressbook/gui/widgets/e-addressbook-util.c:91
-#: addressbook/gui/widgets/e-minicard.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:531
 #, fuzzy
 msgid "Error modifying card"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1141
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1178
 #, fuzzy
 msgid "Success"
 msgstr "Fonts"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #, fuzzy
 msgid "Repository offline"
 msgstr "S'est� movent"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1171
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "Perm�s denegat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 #, fuzzy
 msgid "Card not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 #, fuzzy
 msgid "Protocol not supported"
 msgstr "Operaci� no suportada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
-#: camel/camel-service.c:739 camel/camel-service.c:779
-#: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:779
+#: camel/camel-service.c:849 camel/camel-service.c:892
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancel�lat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Autenticaci�:"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autenticaci�:"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "La carpeta `%s' no existeix."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 #, fuzzy
 msgid "Other error"
 msgstr "Error d'E/S"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:63
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#, fuzzy
+msgid "_Discard"
+msgstr "Imprimeix l'agenda"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 #, fuzzy
 msgid "Error adding list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
-#: addressbook/gui/widgets/e-addressbook-util.c:292
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 #, fuzzy
 msgid "Error adding card"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #, fuzzy
 msgid "Error modifying list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 #, fuzzy
 msgid "Error removing list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
-#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1588
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 #, fuzzy
 msgid "Error removing card"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-#, fuzzy
-msgid "Display Cards?"
-msgstr "_Visualitzaci�"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-#, fuzzy
-msgid "Display Cards"
-msgstr "_Visualitzaci�"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:213
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 #, fuzzy
 msgid "Move card to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 #, fuzzy
 msgid "Copy card to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 #, fuzzy
 msgid "Move cards to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 #, fuzzy
 msgid "Copy cards to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Mou el missatge"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+#, fuzzy
+msgid "Type"
+msgstr "Tipus:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:577
 #, fuzzy
 msgid "Addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
-#: addressbook/gui/widgets/e-addressbook-view.c:813
-#: addressbook/gui/widgets/e-addressbook-view.c:1790
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "New Contact..."
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_V�s a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 #, fuzzy
 msgid "Import..."
 msgstr "S'est� movent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Cerca contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Afegeix una font"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Par�metres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:814
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Reenvia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:816
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimeix el missatge..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Copia a la carpeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Mou a la carpeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:826
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Cut"
 msgstr "Personalitzat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:827
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:828
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Enganxa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 #, fuzzy
 msgid "Current View"
 msgstr "l'hora actual"
@@ -3318,7 +3312,7 @@ msgstr "l'hora actual"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3326,11 +3320,11 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1290
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3412,20 +3406,59 @@ msgstr "Contacte _nou"
 msgid "Primary Phone"
 msgstr "Primari"
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+#, fuzzy
+msgid "Width"
+msgstr "Amplada:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "Al�ada:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+#, fuzzy
+msgid "Field"
+msgstr "Camps"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "Nom complet:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 #, fuzzy
 msgid ""
 "\n"
@@ -3440,7 +3473,7 @@ msgstr ""
 "\n"
 "Feu doble clic aqu� per crear un nou contacte."
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 #, fuzzy
 msgid ""
 "\n"
@@ -3453,24 +3486,44 @@ msgstr ""
 "\n"
 "Feu doble clic aqu� per crear un nou contacte."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:452
+#, fuzzy
+msgid "Adapter"
+msgstr "despr�s de"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Suprimeix"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Tasques"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 #, fuzzy
 msgid "Card View"
 msgstr "Cotxe"
 
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#, fuzzy
+msgid "GTK Tree View"
+msgstr "Setmana"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 #, fuzzy
 msgid "Print envelope"
 msgstr "Imprimeix el missatge..."
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 #, fuzzy
 msgid "Print cards"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
 #, fuzzy
 msgid "Print card"
 msgstr "Imprimeix l'agenda"
@@ -3545,7 +3598,6 @@ msgid "Include:"
 msgstr "Inclou:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Horitzontal"
 
@@ -3565,17 +3617,16 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Nombre de columnes:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Opcions"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientaci�"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "P�gina"
 
@@ -3591,9 +3642,7 @@ msgstr "Paper"
 msgid "Paper source:"
 msgstr "Font del paper:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Vertical"
 
@@ -3655,43 +3704,167 @@ msgstr "Lletra..."
 msgid "Untitled appointment"
 msgstr "Edita una cita"
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr "1"
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "2"
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "3"
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr "4"
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr "5"
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr "6"
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr "7"
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr "8"
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr "9"
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr "10"
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr "11"
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr "12"
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr "13"
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr "14"
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr "15"
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr "16"
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr "17"
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr "18"
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr "19"
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr "20"
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr "21"
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "22"
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "23"
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr "24"
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr "25"
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr "26"
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr "27"
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr "28"
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr "29"
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr "30"
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr "31"
+
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "Alta"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1721
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "Baixa"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaci� d'agenda del Pilot"
 
@@ -3700,96 +3873,82 @@ msgstr "No s'ha pogut llegir el bloc d'aplicaci� d'agenda del Pilot"
 msgid "Default Priority:"
 msgstr "_Prioritat:"
 
-#: calendar/conduits/todo/todo-conduit.c:951
 #: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaci� de coses per fer del Pilot"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #, fuzzy
 msgid "Calendar and Tasks"
 msgstr "_Par�metres"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 #, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Conducte de l'agenda de l'Evolution"
+msgid "Evolution Calendar and Tasks"
+msgstr "_Par�metres"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
 msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 #, fuzzy
-msgid "Factory for the Evolution Tasks control"
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Evolution Calendar configuration control"
+msgstr "Configuraci� del correu"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 #, fuzzy
-msgid "Factory for the calendar iTip view control"
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Conducte de l'agenda de l'Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 #, fuzzy
-msgid "Factory for the sample Calendar control"
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Evolution Calendar viewer"
+msgstr "Conducte de l'agenda de l'Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 #, fuzzy
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Evolution Calendar/Task editor"
+msgstr "Conducte de l'agenda de l'Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 #, fuzzy
-msgid "Factory to create a component editor factory"
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr ""
+msgid "Evolution Tasks viewer"
+msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr ""
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Conducte de l'agenda de l'Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Starting:"
 msgstr "_Par�metres"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 #, fuzzy
 msgid "Ending:"
 msgstr "Ombrejat"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 #, fuzzy
 msgid "invalid time"
 msgstr "Hora de _finalitzaci�:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
 #, fuzzy, c-format
 msgid "Alarm on %s"
 msgstr "Alarmes"
@@ -3814,12 +3973,19 @@ msgstr "Durada de l'snooze (minuts)"
 msgid "_Edit appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 #, fuzzy
 msgid "No description available."
 msgstr "No hi ha cap resum disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:741
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
+#, fuzzy
+msgid "Warning"
+msgstr "S'est� movent"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:849
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3827,14 +3993,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
-#: widgets/misc/e-messagebox.c:159
-#, fuzzy
-msgid "Warning"
-msgstr "S'est� movent"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:764
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3845,17 +4004,17 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:778
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Envia aquest missatge"
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:173
 #, fuzzy
-msgid "Could not initialize GNOME"
+msgid "Could not initialize gnome-vfs"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:180
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
@@ -3875,30 +4034,30 @@ msgstr "Descripci�:"
 msgid "Comment contains"
 msgstr "cont�"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:409 calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:416
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:440 calendar/gui/calendar-commands.c:442
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %d de %B de %Y"
@@ -3906,8 +4065,8 @@ msgstr "%A, %d de %B de %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3916,69 +4075,172 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
+msgid "Calendar"
+msgstr "Agenda"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:75
+#, fuzzy
+msgid "Public Calendar"
+msgstr "Agenda"
+
+#: calendar/gui/calendar-component.c:76
+msgid "Public folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
+msgid "Tasks"
+msgstr "Tasques"
+
+#: calendar/gui/calendar-component.c:81
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "Filtre sobre la llista de correu"
+
+#: calendar/gui/calendar-component.c:85
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Imprimeix l'agenda"
+
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Filtre sobre la llista de correu"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "New appointment"
+msgstr "Nova cita..."
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "_Appointment"
+msgstr "Cites:"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "New meeting"
+msgstr "Cancel�lat"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "_Meeting"
+msgstr "Cancel�lat"
+
+#: calendar/gui/calendar-component.c:736
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Crea un nou contacte"
+
+#: calendar/gui/calendar-component.c:740
+#, fuzzy
+msgid "New task"
+msgstr "Tasca"
+
+#: calendar/gui/calendar-component.c:740
+#, fuzzy
+msgid "_Task"
+msgstr "Tasca"
+
+#: calendar/gui/calendar-component.c:741
+#, fuzzy
+msgid "Create a new task"
+msgstr "Crea un nou contacte"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Nova cita..."
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Nova cita..."
+
+#: calendar/gui/calendar-component.c:746
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
+#: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
 msgid "Public"
 msgstr "P�blic"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
+#: calendar/gui/e-calendar-table.c:445
 #, fuzzy
 msgid "Free"
 msgstr "setmana"
 
-#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1165
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr "Ocupat"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "No iniciat"
 
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "En proc�s"
 
-#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 #, fuzzy
 msgid "Completed"
 msgstr "% comp_let:"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3989,210 +4251,116 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
-#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
-#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:79
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "Cap"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1706
 #, fuzzy
 msgid "Recurring"
 msgstr "Recurr�ncia"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1708
 #, fuzzy
 msgid "Assigned"
 msgstr "Assigna una puntuaci�"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
-#: calendar/gui/e-meeting-model.c:862
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
+#: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:863
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
 #, fuzzy
 msgid "No"
 msgstr "Ara"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 #, fuzzy
 msgid "Day View"
 msgstr "Cotxe"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 #, fuzzy
 msgid "Work Week View"
 msgstr "Setmana de treball"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 #, fuzzy
 msgid "Week View"
 msgstr "Setmana"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 #, fuzzy
 msgid "Month View"
 msgstr "Mes"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
-msgid "Calendar"
-msgstr "Agenda"
-
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr ""
-
-#: calendar/gui/component-factory.c:76
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
-msgid "Public Calendar"
-msgstr "Agenda"
+msgid "Error while opening the calendar"
+msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: calendar/gui/component-factory.c:77
-msgid "Public folder containing appointments and events"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
-#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1063
-msgid "Tasks"
-msgstr "Tasques"
-
-#: calendar/gui/component-factory.c:82
-#, fuzzy
-msgid "Folder containing to-do items"
-msgstr "Filtre sobre la llista de correu"
-
-#: calendar/gui/component-factory.c:86
-#, fuzzy
-msgid "Public Tasks"
-msgstr "Imprimeix l'agenda"
-
-#: calendar/gui/component-factory.c:87
-#, fuzzy
-msgid "Public folder containing to-do items"
-msgstr "Filtre sobre la llista de correu"
-
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/comp-editor-factory.c:473
 #, fuzzy
-msgid "New appointment"
-msgstr "Nova cita..."
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "_Appointment"
-msgstr "Cites:"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "Crea una nova cita"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "New meeting"
-msgstr "Cancel�lat"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "_Meeting"
-msgstr "Cancel�lat"
-
-#: calendar/gui/component-factory.c:756
-#, fuzzy
-msgid "Create a new meeting request"
-msgstr "Crea un nou contacte"
-
-#: calendar/gui/component-factory.c:760
-#, fuzzy
-msgid "New task"
-msgstr "Tasca"
-
-#: calendar/gui/component-factory.c:760
-#, fuzzy
-msgid "_Task"
-msgstr "Tasca"
-
-#: calendar/gui/component-factory.c:761
-#, fuzzy
-msgid "Create a new task"
-msgstr "Crea un nou contacte"
-
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "New All Day Appointment"
-msgstr "Nova cita..."
-
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "All _Day Appointment"
-msgstr "Nova cita..."
-
-#: calendar/gui/component-factory.c:766
-#, fuzzy
-msgid "Create a new all-day appointment"
-msgstr "Crea una nova cita"
+msgid "Permission denied to open the calendar"
+msgstr "Perm�s denegat"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrar� l'agenda"
 
-#: calendar/gui/control-factory.c:174
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/dialogs/alarm-options.c:420
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Alarmes ac�stiques"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:429
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Destinataris del missatge"
 
-#: calendar/gui/dialogs/alarm-options.c:377
+#: calendar/gui/dialogs/alarm-options.c:438
 #, fuzzy
-msgid "Mail Alarm Options"
+msgid "Email Alarm Options"
 msgstr "Opcions de visualitzaci�"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 #, fuzzy
 msgid "Alarm Repeat"
 msgstr "Propietats de l'alarma"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 #, fuzzy
 msgid "Message to Display"
@@ -4200,159 +4368,54 @@ msgstr "Esborra la visualitzaci� del missatge"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
 #, fuzzy
+msgid "Message to Send"
+msgstr "Cos del missatge"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+#, fuzzy
 msgid "Play sound:"
 msgstr "Final del dia:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 #, fuzzy
 msgid "Run program:"
 msgstr "_Executa el programa:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Envia \"%s\""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
-#: filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
 msgid "days"
 msgstr "dies"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 #, fuzzy
 msgid "extra times every"
 msgstr "_Actualitza lliure/ocupat"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
-#: filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
-#: filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minuts"
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, fuzzy, c-format
-msgid "%d days"
-msgstr "dies"
-
-#: calendar/gui/dialogs/alarm-page.c:322
-#, fuzzy
-msgid "1 day"
-msgstr "Mostra 1 dia"
-
-#: calendar/gui/dialogs/alarm-page.c:327
-#, fuzzy, c-format
-msgid "%d weeks"
-msgstr "setmanes"
-
-#: calendar/gui/dialogs/alarm-page.c:330
-#, fuzzy
-msgid "1 week"
-msgstr "Mostra 1 setmana"
-
-#: calendar/gui/dialogs/alarm-page.c:335
-#, fuzzy, c-format
-msgid "%d hours"
-msgstr "hores"
-
-#: calendar/gui/dialogs/alarm-page.c:338
-#, fuzzy
-msgid "1 hour"
-msgstr "hora"
-
-#: calendar/gui/dialogs/alarm-page.c:343
-#, fuzzy, c-format
-msgid "%d minutes"
-msgstr "minuts"
-
-#: calendar/gui/dialogs/alarm-page.c:346
-#, fuzzy
-msgid "1 minute"
-msgstr "10 minuts"
-
-#: calendar/gui/dialogs/alarm-page.c:351
-#, fuzzy, c-format
-msgid "%d seconds"
-msgstr " segons"
-
-#: calendar/gui/dialogs/alarm-page.c:354
-#, fuzzy
-msgid "1 second"
-msgstr " segons"
-
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#, fuzzy
-msgid "Display a message"
-msgstr "Visualitza l'UID del missatge \"%s\""
-
-#: calendar/gui/dialogs/alarm-page.c:391
-#, fuzzy
-msgid "Send an email"
-msgstr "S'est� recollint el correu des de %s"
-
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
-msgid "Run a program"
-msgstr "_Executa el programa:"
-
-#: calendar/gui/dialogs/alarm-page.c:401
-#, fuzzy
-msgid "Unknown action to be performed"
-msgstr "Error desconegut"
-
-#: calendar/gui/dialogs/alarm-page.c:413
-#, fuzzy, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "Crea una nova cita"
-
-#: calendar/gui/dialogs/alarm-page.c:416
-#, fuzzy, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "Crea una nova cita"
-
-#: calendar/gui/dialogs/alarm-page.c:421
-#, fuzzy, c-format
-msgid "%s at the start of the appointment"
-msgstr "Crea una nova cita"
-
-#: calendar/gui/dialogs/alarm-page.c:430
-#, fuzzy, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "Crea una nova cita"
-
-#: calendar/gui/dialogs/alarm-page.c:433
-#, fuzzy, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "Crea una nova cita"
-
-#: calendar/gui/dialogs/alarm-page.c:438
-#, fuzzy, c-format
-msgid "%s at the end of the appointment"
-msgstr "Crea una nova cita"
-
-#: calendar/gui/dialogs/alarm-page.c:462
-#, fuzzy, c-format
-msgid "%s at %s"
-msgstr "%2$s%1$s"
-
-#: calendar/gui/dialogs/alarm-page.c:468
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, fuzzy
@@ -4365,50 +4428,69 @@ msgstr "Enganxa"
 msgid "Date/Time:"
 msgstr "Data d'enviament"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+#, fuzzy
+msgid "Display a message"
+msgstr "Visualitza l'UID del missatge \"%s\""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Recordatoris"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+#, fuzzy
+msgid "Run a program"
+msgstr "_Executa el programa:"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "S'est� recollint el correu des de %s"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resum:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 #, fuzzy
 msgid "_Options..."
 msgstr "_Opcions"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "despr�s de"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "abans de"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "dia(es)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 #, fuzzy
 msgid "end of appointment"
 msgstr "Recorda'm totes les cites"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 #, fuzzy
 msgid "hour(s)"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 #, fuzzy
 msgid "minute(s)"
 msgstr "minuts"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 #, fuzzy
 msgid "start of appointment"
 msgstr "Edita una cita"
@@ -4433,7 +4515,7 @@ msgstr "30 minuts"
 msgid "60 minutes"
 msgstr "60 minuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Alerts"
 msgstr "Alarmes"
@@ -4462,7 +4544,8 @@ msgid "Days"
 msgstr "Dies"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Divendres"
 
@@ -4475,7 +4558,8 @@ msgid "Minutes"
 msgstr "Minuts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Dilluns"
 
@@ -4485,7 +4569,8 @@ msgid "S_un"
 msgstr "dg."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Dissabte"
 
@@ -4499,7 +4584,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Mostra els n�meros de les setmanes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1137
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Diumenge"
 
@@ -4519,7 +4605,8 @@ msgid "Task List"
 msgstr "Tasques"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Dijous"
 
@@ -4537,7 +4624,8 @@ msgid "Time format:"
 msgstr "Format de l'hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Dimarts"
 
@@ -4546,7 +4634,8 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Dimecres"
 
@@ -4595,7 +4684,7 @@ msgid "_Fri"
 msgstr "dv."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_General"
 msgstr "General"
@@ -4645,167 +4734,171 @@ msgstr "dc."
 msgid "before every appointment"
 msgstr "Recorda'm totes les cites"
 
-#: calendar/gui/dialogs/cancel-comp.c:56
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:59
+#: calendar/gui/dialogs/cancel-comp.c:61
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/cancel-comp.c:65
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:70
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/cancel-comp.c:74
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:77
+#: calendar/gui/dialogs/cancel-comp.c:79
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Error desconegut: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 #, fuzzy
 msgid " (Completed "
 msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 #, fuzzy
 msgid "Completed "
 msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 #, fuzzy
 msgid "Due "
 msgstr "Data de venciment"
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
 #, fuzzy
 msgid "Could not update object"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Sense resum"
 
-#: calendar/gui/dialogs/comp-editor.c:1221
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
-#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/dialogs/comp-editor.c:1322
-#: calendar/gui/dialogs/comp-editor.c:1346
-#: calendar/gui/dialogs/comp-editor.c:1370
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1331
+#: calendar/gui/dialogs/comp-editor.c:1355
+#: calendar/gui/dialogs/comp-editor.c:1379
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4887,96 +4980,109 @@ msgstr "Suprimeix"
 msgid "Enter Delegate"
 msgstr "Suprimeix"
 
-#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 #, fuzzy
 msgid "Appointment"
 msgstr "Cites:"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Recordatori"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Recurr�ncia"
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:433
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 #, fuzzy
 msgid "Scheduling"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 #, fuzzy
 msgid "Meeting"
 msgstr "Cancel�lat"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
+#, fuzzy
+msgid "Start date is wrong"
+msgstr "Data d'ini_ci:"
+
+#: calendar/gui/dialogs/event-page.c:610
+msgid "End date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:633
+#, fuzzy
+msgid "Start time is wrong"
+msgstr "Hora d'_inici:"
+
+#: calendar/gui/dialogs/event-page.c:640
+msgid "End time is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 #, fuzzy
 msgid "B_usy"
 msgstr "Ocupat"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Classificaci�"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Con_fidential"
 msgstr "Confidencial"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
 msgid "Date & Time"
 msgstr "Data d'enviament"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 #, fuzzy
 msgid "F_ree"
 msgstr "setmana"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 #, fuzzy
 msgid "L_ocation:"
 msgstr "_Accions"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "P�_blic"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Show Time As"
 msgstr "Mostra"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Resu_m:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Contactes..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 #, fuzzy
 msgid "_End time:"
@@ -4986,19 +5092,23 @@ msgstr "Hora de _finalitzaci�:"
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
-#: calendar/gui/dialogs/meeting-page.c:414
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Suprimeix"
@@ -5046,17 +5156,11 @@ msgid "Member"
 msgstr "desembre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-#, fuzzy
-msgid "Role"
-msgstr "M�bil"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
@@ -5065,14 +5169,6 @@ msgstr "M�bil"
 msgid "Status"
 msgstr "_Estat:"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
-#, fuzzy
-msgid "Type"
-msgstr "Tipus:"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 #, fuzzy
@@ -5085,106 +5181,85 @@ msgid "_Change Organizer"
 msgstr "Organitzaci�:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr "_Invita a altres..."
 
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-#, fuzzy
-msgid "st"
-msgstr "1"
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-#, fuzzy
-msgid "nd"
-msgstr "2"
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-#, fuzzy
-msgid "rd"
-msgstr "3"
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-#, fuzzy
-msgid "th"
-msgstr "4"
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:75
+msgid "This and Future Instances"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:77
+#, fuzzy
+msgid "All Instances"
+msgstr "Afegeix..."
 
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:898
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "el"
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr "primer"
 
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "segon"
 
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr "tercer"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 #, fuzzy
 msgid "fourth"
 msgstr "quart"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 #, fuzzy
 msgid "last"
 msgstr "�s"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 #, fuzzy
 msgid "Other Date"
 msgstr "Un altre fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "dia"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 #, fuzzy
 msgid "occurrences"
 msgstr "aparicions"
@@ -5255,22 +5330,27 @@ msgstr "setmana(es)"
 msgid "year(s)"
 msgstr "any(s)"
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:59
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:70
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
+#: calendar/gui/dialogs/task-details-page.c:397
+#, fuzzy
+msgid "Completed date is wrong"
+msgstr "% comp_let:"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, fuzzy, no-c-format
@@ -5281,47 +5361,44 @@ msgstr "% comp_let:"
 msgid "Date Completed:"
 msgstr "Data completa:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
-#, fuzzy
-msgid "Needs Action"
-msgstr "Elimina una acci�"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #, fuzzy
 msgid "Progress"
 msgstr "En proc�s"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:860
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Prioritat:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 #, fuzzy
 msgid "Basic"
 msgstr "Enganxa"
 
-#: calendar/gui/dialogs/task-editor.c:216
-#: calendar/gui/dialogs/task-editor.c:261
-#: calendar/gui/dialogs/task-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 #, fuzzy
 msgid "Assignment"
 msgstr "Assigna una puntuaci�"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
+#: calendar/gui/dialogs/task-page.c:527
+msgid "Due date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Descripci�:"
 
@@ -5330,85 +5407,189 @@ msgstr "Descripci�:"
 msgid "Sta_rt Date:"
 msgstr "Data d'ini_ci:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Contactes..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Data de venciment:"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "dies"
+
+#: calendar/gui/e-alarm-list.c:396
+#, fuzzy
+msgid "1 day"
+msgstr "Mostra 1 dia"
+
+#: calendar/gui/e-alarm-list.c:401
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr "setmanes"
+
+#: calendar/gui/e-alarm-list.c:404
+#, fuzzy
+msgid "1 week"
+msgstr "Mostra 1 setmana"
+
+#: calendar/gui/e-alarm-list.c:409
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr "hores"
+
+#: calendar/gui/e-alarm-list.c:412
+#, fuzzy
+msgid "1 hour"
+msgstr "hora"
+
+#: calendar/gui/e-alarm-list.c:417
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr "minuts"
+
+#: calendar/gui/e-alarm-list.c:420
+#, fuzzy
+msgid "1 minute"
+msgstr "10 minuts"
+
+#: calendar/gui/e-alarm-list.c:425
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " segons"
+
+#: calendar/gui/e-alarm-list.c:428
+#, fuzzy
+msgid "1 second"
+msgstr " segons"
+
+#: calendar/gui/e-alarm-list.c:465
+#, fuzzy
+msgid "Send an email"
+msgstr "S'est� recollint el correu des de %s"
+
+#: calendar/gui/e-alarm-list.c:475
+#, fuzzy
+msgid "Unknown action to be performed"
+msgstr "Error desconegut"
+
+#: calendar/gui/e-alarm-list.c:487
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/e-alarm-list.c:490
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/e-alarm-list.c:495
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/e-alarm-list.c:504
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/e-alarm-list.c:507
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/e-alarm-list.c:512
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/e-alarm-list.c:536
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%2$s%1$s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:418
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:419
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:420
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:421
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:422
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:423
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-calendar-table.c:424
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-calendar-table.c:425
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
-#: calendar/gui/e-week-view.c:1917
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1910
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Suprimeix un contacte"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
-#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
-#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 #, fuzzy
 msgid "_Open"
 msgstr "_Obre"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 #, fuzzy
 msgid "_Save as..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
-#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
@@ -5416,61 +5597,61 @@ msgstr "Anomena i desa..."
 msgid "_Print..."
 msgstr "Imprimeix..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
-#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 msgstr "Personalitzat"
 
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
-#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "_Copy"
 msgstr "Copia"
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
-#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Paste"
 msgstr "Enganxa"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 #, fuzzy
 msgid "_Assign Task"
 msgstr "_Tasca (FIXME)"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
-#: calendar/gui/e-week-view.c:4240
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1360
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -5480,8 +5661,8 @@ msgstr "Feu clic aqu� per a la llibreta d'adreces"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1096
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 #, fuzzy
 msgid "Complete"
 msgstr "% comp_let:"
@@ -5514,8 +5695,8 @@ msgid "Start Date"
 msgstr "Data d'ini_ci:"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:748
-#: shell/e-shortcuts.c:1051
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 #, fuzzy
 msgid "Summary"
 msgstr "R_esum"
@@ -5525,20 +5706,15 @@ msgstr "R_esum"
 msgid "Task sort"
 msgstr "Tasques"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
-#, fuzzy
-msgid "URL"
-msgstr "URL:"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:166
+#: e-util/e-time-utils.c:379
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:161
+#: e-util/e-time-utils.c:388
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -5553,532 +5729,611 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:518
+#: calendar/gui/e-day-view-time-item.c:529
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisions de minut"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-day-view.c:3662
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 #, fuzzy
 msgid "New Meeting"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 #, fuzzy
 msgid "New Task"
 msgstr "Tasca"
 
-#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimeix..."
 
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Go to _Today"
 msgstr "V�s a avui"
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "V�s a una data"
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Par�metres"
 
-#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
-#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Save As..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix-ne aquesta aparici�"
 
-#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "Recurr�ncia simple"
+
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "Cada"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "dies"
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "Cada"
+
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr "setmanes"
+
+#: calendar/gui/e-itip-control.c:729
+msgid "Every week on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:731
+#, fuzzy, c-format
+msgid "Every %d weeks on "
+msgstr "setmanes"
+
+#: calendar/gui/e-itip-control.c:739
+#, fuzzy
+msgid " and "
+msgstr "_Envia"
+
+#: calendar/gui/e-itip-control.c:746
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:764
+#, fuzzy
+msgid "every month"
+msgstr "mes"
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:775
+#, fuzzy
+msgid "Every year"
+msgstr "Cada"
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:831
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:861
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "Descripci�:"
 
-#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Cap informaci�"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
-#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 #, fuzzy
 msgid "An unknown person"
 msgstr "Error desconegut"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Location:"
 msgstr "_Accions"
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
 #, fuzzy
 msgid "Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:490
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:414
 #, fuzzy
 msgid "Accepted"
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 #, fuzzy
 msgid "Declined"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
-#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:444
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
 #, fuzzy
 msgid "Update"
 msgstr "ha estat despr�s de"
 
-#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Accept"
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Decline"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1226
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
-#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 #, fuzzy
 msgid "Cancel"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1320
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1326
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1328
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1333
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1338
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1339
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "FIXME: Pe_tici� de cita"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1346
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1354
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
-#: calendar/gui/e-itip-control.c:1245
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1363
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "_Edita el missatge"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1387
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
 #, fuzzy
 msgid "Task Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1393
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1396
 #, fuzzy
 msgid "Task Proposal"
 msgstr "TaskPad"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1400
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
 #, fuzzy
 msgid "Task Update"
 msgstr "ha estat despr�s de"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1405
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1406
 #, fuzzy
 msgid "Task Update Request"
 msgstr "FIXME: _Petici� de tasca"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1413
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
 #, fuzzy
 msgid "Task Reply"
 msgstr "Respon"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1421
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1430
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1449
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1450
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1454
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1455
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1459
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1460
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1465
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1604
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1441
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "No es pot executar el Bug Buddy."
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1916
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1919
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Data completa:"
 
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1739
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:2008
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2011
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:2014
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2049
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data d'enviament"
 
-#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2206
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccioneu una carpeta"
@@ -6126,236 +6381,241 @@ msgstr ""
 msgid "date-start"
 msgstr "Inici del dia:"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 #, fuzzy
 msgid "Required Participants"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Resources"
 msgstr "Font"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:831
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:807
 #, fuzzy
 msgid "Group"
 msgstr "Grup %i"
 
-#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:808
 #, fuzzy
 msgid "Resource"
 msgstr "Font"
 
-#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:822
 #, fuzzy
 msgid "Chair"
 msgstr "Cotxe"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 #, fuzzy
 msgid "Required Participant"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
+#: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
+#: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+#, fuzzy
+msgid "Needs Action"
+msgstr "Elimina una acci�"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:879
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:855
 #, fuzzy
 msgid "Delegated"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 #, fuzzy
 msgid "In Process"
 msgstr "En proc�s"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2114
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
+#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Opcions"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Mostra _nom�s les hores de treball"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Mostra-ho reduint el zoom"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Actualitza lliure/ocupat"
 
-#: calendar/gui/e-meeting-time-sel.c:544
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr "Tria autom�tica"
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr "_Totes les persones i recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Totes les persones i un recurs"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Persones requerides i _un recurs"
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Hora d'_inici de la reuni�:"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
 #: calendar/gui/gnome-cal.c:2024
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No s'ha pogut carregar l'agenda en `%s'"
 
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Completat"
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Suprimeix un contacte"
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 #, fuzzy
 msgid "Expunging"
 msgstr "_Esborra"
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:1541
+#: calendar/gui/gnome-cal.c:1517
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 
-#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1581
+#: calendar/gui/gnome-cal.c:1563
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmes"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6363,7 +6623,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6371,7 +6631,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1996
+#: calendar/gui/gnome-cal.c:1995
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Obre l'agenda"
@@ -6451,331 +6711,189 @@ msgstr "octubre"
 msgid "September"
 msgstr "setembre"
 
-#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 #, fuzzy
 msgid "Event information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 #, fuzzy
 msgid "Task information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 #, fuzzy
 msgid "Journal information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 #, fuzzy
 msgid "Calendar information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 #, fuzzy
 msgid "Updated"
 msgstr "ha estat despr�s de"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
 #, fuzzy
 msgid "Refresh"
 msgstr "Refresca la llista"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:513
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:70
-#, fuzzy
-msgid "Could not activate Bonobo"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
-
-#: calendar/gui/main.c:99
-#, fuzzy
-msgid "Could not create the component editor factory"
-msgstr "No s'ha pogut crear el directori temporal: %s"
-
-#: calendar/gui/print.c:456
-msgid "1st"
-msgstr "1"
-
-#: calendar/gui/print.c:456
-msgid "2nd"
-msgstr "2"
-
-#: calendar/gui/print.c:456
-msgid "3rd"
-msgstr "3"
-
-#: calendar/gui/print.c:456
-msgid "4th"
-msgstr "4"
-
-#: calendar/gui/print.c:456
-msgid "5th"
-msgstr "5"
-
-#: calendar/gui/print.c:457
-msgid "6th"
-msgstr "6"
-
-#: calendar/gui/print.c:457
-msgid "7th"
-msgstr "7"
-
-#: calendar/gui/print.c:457
-msgid "8th"
-msgstr "8"
-
-#: calendar/gui/print.c:457
-msgid "9th"
-msgstr "9"
-
-#: calendar/gui/print.c:457
-msgid "10th"
-msgstr "10"
-
-#: calendar/gui/print.c:458
-msgid "11th"
-msgstr "11"
-
-#: calendar/gui/print.c:458
-msgid "12th"
-msgstr "12"
-
-#: calendar/gui/print.c:458
-msgid "13th"
-msgstr "13"
-
-#: calendar/gui/print.c:458
-msgid "14th"
-msgstr "14"
-
-#: calendar/gui/print.c:458
-msgid "15th"
-msgstr "15"
-
-#: calendar/gui/print.c:459
-msgid "16th"
-msgstr "16"
-
-#: calendar/gui/print.c:459
-msgid "17th"
-msgstr "17"
-
-#: calendar/gui/print.c:459
-msgid "18th"
-msgstr "18"
-
-#: calendar/gui/print.c:459
-msgid "19th"
-msgstr "19"
-
-#: calendar/gui/print.c:459
-msgid "20th"
-msgstr "20"
-
-#: calendar/gui/print.c:460
-msgid "21st"
-msgstr "21"
-
-#: calendar/gui/print.c:460
-msgid "22nd"
-msgstr "22"
-
-#: calendar/gui/print.c:460
-msgid "23rd"
-msgstr "23"
-
-#: calendar/gui/print.c:460
-msgid "24th"
-msgstr "24"
-
-#: calendar/gui/print.c:460
-msgid "25th"
-msgstr "25"
-
-#: calendar/gui/print.c:461
-msgid "26th"
-msgstr "26"
-
-#: calendar/gui/print.c:461
-msgid "27th"
-msgstr "27"
-
-#: calendar/gui/print.c:461
-msgid "28th"
-msgstr "28"
-
-#: calendar/gui/print.c:461
-msgid "29th"
-msgstr "29"
-
-#: calendar/gui/print.c:461
-msgid "30th"
-msgstr "30"
-
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr "31"
-
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "Dg"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Dl"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Dm"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Dc"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Dj"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Dv"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "Ds"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Avui (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
-#: calendar/gui/print.c:1896
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1922
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Aquesta setmana (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Aquest mes (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Enguany (%Y)"
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 #, fuzzy
 msgid "Task"
 msgstr "Tasca"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "_Estat:"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioritat:"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Marca la tasca com a completa"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2370
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL:"
 
-#: calendar/gui/print.c:2364
+#: calendar/gui/print.c:2384
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr "categories"
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 #, fuzzy
 msgid "Contacts: "
 msgstr "_Contactes..."
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Imprimeix l'agenda"
-
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
-#: my-evolution/e-summary.c:633
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "Previsualitzaci� d'impressi�"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 #, fuzzy
 msgid "Print Item"
 msgstr "Imprimeix aquest element"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 #, fuzzy
 msgid "Print Setup"
 msgstr "Configuraci� de la p�gina:"
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrar� l'agenda"
 
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:472
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6783,98 +6901,70 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
-#: mail/mail-callbacks.c:2912
+#: calendar/gui/tasks-control.c:479
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Envia aquest missatge"
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:108
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:120
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:133
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
 #, fuzzy
 msgid "SMTWTFS"
 msgstr "DDDDDDD"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Evolution Calendar intelligent importer"
+msgstr "Conducte de l'agenda de l'Evolution"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 #, fuzzy
-msgid "Imports iCalendar files into Evolution"
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Evolution iCalendar importer"
+msgstr "Conducte de l'agenda de l'Evolution"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 #, fuzzy
-msgid "Imports vCalendar files into Evolution"
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Evolution vCalendar importer"
+msgstr "Conducte de l'agenda de l'Evolution"
 
-#: calendar/importers/icalendar-importer.c:168
-#, fuzzy, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr ""
-"No es pot recuperar el missatge: %s\n"
-"  %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Agenda"
 
-#: calendar/importers/icalendar-importer.c:180
-#, fuzzy, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "No s'ha pogut connectar al servidor POP en %s."
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
+msgstr ""
 
-#: calendar/importers/icalendar-importer.c:483
+#: calendar/importers/icalendar-importer.c:404
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Recordatori"
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Agenda"
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:663
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "_Obre una agenda"
 
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr ""
@@ -8543,32 +8633,42 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
+
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
+
+#: camel/camel-data-cache.c:133
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
@@ -8602,92 +8702,99 @@ msgstr "S'estan escanejant les carpetes de \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "No s'ha pogut crear el conducte a %s: %s"
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-process.c:92
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Missatge de _correu (FIXME)"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "No s'ha pogut crear el directori %s: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 #, fuzzy
 msgid "Syncing folders"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 #, fuzzy
 msgid "Cannot open message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 #, fuzzy
 msgid "Syncing folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "adjunci�"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "adjunci�"
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "No s'ha pogut crear el conducte a %s: %s"
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Missatge de _correu (FIXME)"
-
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8696,7 +8803,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8705,11 +8812,11 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -8743,7 +8850,7 @@ msgstr "C�pia de missatges"
 msgid "Copying messages"
 msgstr "C�pia de missatges"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8751,72 +8858,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:711
+#: camel/camel-gpg-context.c:738
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:761
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:769
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
-#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
-#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancel�lat"
 
-#: camel/camel-gpg-context.c:771
+#: camel/camel-gpg-context.c:798
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 #, fuzzy
 msgid "No data provided"
 msgstr "(Cap carpeta mostrada)"
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1082
+#: camel/camel-gpg-context.c:1125
 #, fuzzy, c-format
 msgid ""
-"Failed to GPG %s message: %s\n"
+"Failed to GPG %s: %s\n"
 "\n"
 "%.*s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-gpg-context.c:1088
+#: camel/camel-gpg-context.c:1131
 #, fuzzy, c-format
-msgid "Failed to GPG %s message: %s\n"
+msgid "Failed to GPG %s: %s\n"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-gpg-context.c:1197
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
-#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
-#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-gpg-context.c:1290
+#: camel/camel-gpg-context.c:1333
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
@@ -8841,25 +8949,24 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr "No s'ha pogut bifurcar: %s"
 
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:93 camel/camel-lock.c:112
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "No s'ha pogut crear el fitxer de blocatge per a %s: %s"
 
-#: camel/camel-lock.c:152
+#: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "S'ha excedit el temps m�xim en intentar recuperar el fitxer de blocatge en %"
 "s. Torneu-ho a provar m�s tard."
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:268
+#: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -8869,51 +8976,51 @@ msgstr ""
 msgid "Could not check mail file %s: %s"
 msgstr "No s'ha pogut comprovar el fitxer de correu %s: %s"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "No s'ha pogut obrir el fitxer de correu %s: %s"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "No s'ha pogut obrir el fitxer temporal de correu %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:157
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "No s'ha pogut emmagatzemar el correu en el fitxer temporal %s: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "No s'ha pogut bifurcar: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "El programa Movemail ha fallat: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(Error desconegut)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Error en escriure el fitxer temporal de correu: %s"
 
-#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Error en escriure el fitxer temporal de correu: %s"
@@ -8930,26 +9037,26 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 #, fuzzy
 msgid "parse error"
 msgstr "Error d'E/S"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "No s'ha pogut carregar %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
@@ -9009,11 +9116,11 @@ msgstr ""
 "Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per autenticar-"
 "vos-hi."
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 #, fuzzy
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
@@ -9022,56 +9129,129 @@ msgstr ""
 "Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya de "
 "text net."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 #, fuzzy
 msgid "Server response did not contain authorization data\n"
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 #, fuzzy
 msgid "Server response does not match\n"
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-gssapi.c:48
+msgid "GSSAPI"
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:50
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr ""
+"Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per autenticar-"
+"vos-hi."
+
+#: camel/camel-sasl-gssapi.c:148
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:153
+msgid "The provided target_name parameter was ill-formed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:156
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:160
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:165
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:169
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:180
+msgid "The consistency checks performed on the credential failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:183
+msgid "The referenced credentials have expired."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "Resposta inesperada del servidor IMAP: %s"
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "No s'ha pogut crear el conducte a %s: %s"
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Detecta els tipus suportats..."
+
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 #, fuzzy
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per autenticar-"
 "vos-hi."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, fuzzy, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-#, fuzzy
-msgid "Bad authentication response from server."
-msgstr "Resposta inesperada del servidor IMAP: %s"
-
 #: camel/camel-sasl-login.c:32
 #, fuzzy
 msgid "Login"
@@ -9127,7 +9307,7 @@ msgstr ""
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, fuzzy, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Error en escriure a la b�stia de correu temporal: %s"
@@ -9147,36 +9327,36 @@ msgstr "L'URL '%s' necessita un component d'ordinador central"
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de cam�"
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "S'est� comprovant \"%s\""
 
-#: camel/camel-service.c:774 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 #, fuzzy
 msgid "Resolving address"
 msgstr "S'est� comprovant \"%s\""
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -9188,12 +9368,12 @@ msgstr "Prove�dor de correu de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per llegir correu com a consulta d'un altre joc de carpetes"
 
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:354 camel/camel-session.c:422
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hi ha cap prove�dor disponible per al protocol `%s'"
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9202,177 +9382,177 @@ msgstr ""
 "No s'ha pogut crear el directori %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:171
 #, fuzzy, c-format
 msgid "Please enter your password for %s"
 msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
 
-#: camel/camel-smime-context.c:203
+#: camel/camel-smime-context.c:201
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, fuzzy, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "Aquest fitxer no existeix."
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, fuzzy, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Aquest fitxer no existeix."
 
-#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
+#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
 #, fuzzy, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr ""
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 #, fuzzy
 msgid "Failed to decode message."
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 #, fuzzy
 msgid "Unable to decrypt certificate signature"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Fitxer de signatura:"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 #, fuzzy
 msgid "Error in CRL"
 msgstr "Error en carregar el fitxer: %s"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 #, fuzzy
 msgid "Out of memory"
 msgstr "Fora de l'oficina"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 #, fuzzy
 msgid "Unable to verify leaf signature"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 #, fuzzy
 msgid "Invalid purpose"
 msgstr "adjunci�"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9381,15 +9561,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9402,7 +9582,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:690
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9412,35 +9592,35 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:734
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:786
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:804
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -9457,41 +9637,41 @@ msgstr "Error en carregar el fitxer: %s"
 msgid "No such message %s in %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Comprova si hi ha nou correu"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No es pot bifurcar %s: %s"
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2611
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2614
+#: camel/providers/imap/camel-imap-store.c:2645
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor ha rebutjat el nom d'usuari"
@@ -9514,54 +9694,54 @@ msgstr "Resposta inesperada del servidor IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 #, fuzzy
 msgid "Server response ended too soon."
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:655
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:691
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta D'acord inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:221
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:240
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No s'ha pogut carregar el resum per a %s"
 
-#: camel/providers/imap/camel-imap-folder.c:306
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:548
+#: camel/providers/imap/camel-imap-folder.c:549
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "S'estan desant els canvis al missatge..."
 
-#: camel/providers/imap/camel-imap-folder.c:1872
+#: camel/providers/imap/camel-imap-folder.c:1873
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9570,28 +9750,28 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
 #, fuzzy
 msgid "No such message"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/imap/camel-imap-folder.c:1931
-#: camel/providers/imap/camel-imap-folder.c:2527
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
 "Aquest missatge no t� cap assumpte.\n"
 "Voleu que l'envi� igualment?"
 
-#: camel/providers/imap/camel-imap-folder.c:2191
-#: camel/providers/imap/camel-imap-folder.c:2261
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2565
+#: camel/providers/imap/camel-imap-folder.c:2567
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
@@ -9623,7 +9803,7 @@ msgstr "Comprova si hi ha nou correu"
 msgid "Check for new messages in all folders"
 msgstr "Comprova si hi ha nou correu"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "Carpetes"
 
@@ -9656,7 +9836,7 @@ msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -9676,65 +9856,64 @@ msgstr "Servidor %s %s"
 msgid "IMAP service for %s on %s"
 msgstr "Servei %s per a %s en %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "Cancel�lat"
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No s'ha pogut connectar a %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operaci� no suportada"
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autenticaci�:"
 
-#: camel/providers/imap/camel-imap-store.c:1082
+#: camel/providers/imap/camel-imap-store.c:1075
 #, fuzzy, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
 
-#: camel/providers/imap/camel-imap-store.c:1092
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autenticaci�:"
 
-#: camel/providers/imap/camel-imap-store.c:1116
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSi us plau, introdu�u la contrasenya IMAP per a %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1131
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1160
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9745,24 +9924,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1462
-#: camel/providers/imap/camel-imap-store.c:1604
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1851
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9843,8 +10022,8 @@ msgid ""
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -9856,36 +10035,36 @@ msgstr "`%s' no �s un fitxer habitual."
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:239
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:388
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:394
+#: camel/providers/local/camel-local-store.c:398
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
@@ -9895,7 +10074,7 @@ msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 msgid "Could not save summary: %s: %s"
 msgstr "No s'ha pogut obrir el resum %s"
 
-#: camel/providers/local/camel-local-summary.c:454
+#: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9909,14 +10088,14 @@ msgstr "Missatge de _correu (FIXME)"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9928,14 +10107,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:168
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9950,75 +10129,75 @@ msgid "`%s' is not a maildir directory."
 msgstr "`%s' no �s un directori."
 
 #: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-maildir-store.c:205
 #: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 #, fuzzy
 msgid "not a maildir directory"
 msgstr "Directori de correu local %s"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:282
-#: camel/providers/local/camel-spool-store.c:312
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 "No s'ha pogut crear la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-summary.c:416
-#: camel/providers/local/camel-maildir-summary.c:545
+#: camel/providers/local/camel-maildir-summary.c:417
+#: camel/providers/local/camel-maildir-summary.c:548
 #, fuzzy, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Comprova si hi ha nou correu"
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "C�pia de missatges"
 
-#: camel/providers/local/camel-maildir-summary.c:729
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:583
-#: camel/providers/local/camel-mbox-summary.c:673
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
 #, fuzzy
 msgid "Storing folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:218
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/providers/local/camel-mbox-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:281
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:396
-#: camel/providers/local/camel-mbox-folder.c:404
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -10027,11 +10206,11 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -10074,80 +10253,80 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta `%s' no �s buida. No s'ha suprimit."
 
-#: camel/providers/local/camel-mbox-summary.c:350
+#: camel/providers/local/camel-mbox-summary.c:343
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:398
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:453
+#: camel/providers/local/camel-mbox-summary.c:447
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:678
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "No s'ha pogut obrir el fitxer %s:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-spool-summary.c:169
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-mbox-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No s'ha pogut tancar la carpeta font %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:621
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "No es pot tancar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:716
-#: camel/providers/local/camel-mbox-summary.c:724
-#: camel/providers/local/camel-mbox-summary.c:913
-#: camel/providers/local/camel-mbox-summary.c:921
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 #, fuzzy
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Incongru�ncia del resum, s'est� interrompent la sincronitzaci�"
 
-#: camel/providers/local/camel-mbox-summary.c:848
-#: camel/providers/local/camel-spool-summary.c:332
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:812
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:976
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error en escriure a la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:993
+#: camel/providers/local/camel-mbox-summary.c:923
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error en escriure a la b�stia de correu temporal: %s"
@@ -10167,69 +10346,69 @@ msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' no �s un directori."
 
-#: camel/providers/local/camel-mh-summary.c:243
+#: camel/providers/local/camel-mh-summary.c:244
 #, fuzzy, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "`%s' no �s un fitxer habitual."
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:153
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/local/camel-spool-store.c:176
+#: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' no �s un fitxer habitual."
 
-#: camel/providers/local/camel-spool-store.c:193
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
 #, fuzzy
 msgid "Spool folders cannot be renamed"
 msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 #, fuzzy
 msgid "Spool folders cannot be deleted"
 msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: camel/providers/local/camel-spool-summary.c:181
-#: camel/providers/local/camel-spool-summary.c:190
-#: camel/providers/local/camel-spool-summary.c:199
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "No s'ha pogut obrir el fitxer temporal de correu %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:214
+#: camel/providers/local/camel-spool-summary.c:211
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "No s'ha pogut tancar la carpeta font %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:244
-#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
 #: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
@@ -10310,46 +10489,46 @@ msgid "Retrieving POP summary"
 msgstr "S'estan recuperant els missatges : %s"
 
 #: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:427
-#: camel/providers/pop3/camel-pop3-folder.c:486
-#: camel/providers/pop3/camel-pop3-folder.c:503
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
 #, fuzzy
 msgid "User cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/providers/pop3/camel-pop3-folder.c:264
+#: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: camel/providers/pop3/camel-pop3-folder.c:401
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hi ha cap missatge amb l'uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:408
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:488
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Error desconegut"
@@ -10369,7 +10548,7 @@ msgstr "No suprimeixis els missatges del servidor"
 msgid "Delete after %s day(s)"
 msgstr "Suprimeix la tasca"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -10396,27 +10575,27 @@ msgstr ""
 "xifrada mitjan�ant el protocol APOP. Aix� no funcionar� per a tots els "
 "usuaris, fins i tot en servidors que diuen que ho suporten."
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "No s'ha pogut connectar a %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
 msgstr "No s'ha pogut connectar al servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10425,28 +10604,28 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "No se us ha pogut autenticar al servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sSi us plau, introdu�u la contrasenya POP3 per a %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10455,13 +10634,13 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar la contrasenya: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:614
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10473,53 +10652,53 @@ msgstr ""
 "Per lliurar correu transferint-lo al programa \"sendmail\" en el sistema "
 "local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 #, fuzzy
 msgid "Could not parse recipient list"
 msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "El sendmail ha acabat amb l'estat %d: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr "Lliurament de correu mitjan�ant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr ""
 
@@ -10530,149 +10709,149 @@ msgstr ""
 "Per al lliurament de correu mitjan�ant la connexi� a un concentrador de "
 "correu utilitzant SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 #, fuzzy
 msgid "Help message"
 msgstr "Mou el missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, fuzzy
 msgid "Service ready"
 msgstr "Amaga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "No s'ha indicat cap contrasenya."
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 #, fuzzy
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:342
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sSi us plau, introdu�u la contrasenya IMAP per a %s@%s"
@@ -10702,12 +10881,12 @@ msgstr "Lliurament de correu mitjan�ant el programa sendmail"
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 #, fuzzy
 msgid "Sending message"
 msgstr "Envia aquest missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
@@ -10716,67 +10895,67 @@ msgstr ""
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "HELO response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
@@ -10784,81 +10963,81 @@ msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 #, fuzzy
 msgid "DATA response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 #, fuzzy
 msgid "RSET response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Error desconegut: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:102
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:113
+#: composer/e-msg-composer-attachment-bar.c:108
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "adjunci�"
 
-#: composer/e-msg-composer-attachment-bar.c:520
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr "Elimina els elements seleccionats de la llista d'adjuncions"
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Afegeix una adjunci�..."
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: composer/e-msg-composer-attachment.c:177
+#: composer/e-msg-composer-attachment.c:176
 #, fuzzy, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Aquest fitxer no �s habitual."
@@ -10876,11 +11055,15 @@ msgid "MIME type:"
 msgstr "Tipus de MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:163
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
@@ -10891,7 +11074,7 @@ msgstr "Feu clic aqu� per a la llibreta d'adreces"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:400
+#: composer/e-msg-composer-hdrs.c:510
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Respon"
@@ -10899,38 +11082,38 @@ msgstr "Respon"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Introdu�u els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:436
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�ntrodu�u les adreces que rebran una c�pia del missatge"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:440
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10941,27 +11124,28 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Prioritat:"
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "Descripci�:"
 
-#: composer/e-msg-composer-select-file.c:275
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
 msgstr "Adjunta un fitxer"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10970,63 +11154,65 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-#, fuzzy
-msgid "Warning!"
-msgstr "S'est� movent"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1285
+#, fuzzy, c-format
+msgid ""
+"Unable to copy file descriptor: %s\n"
+"%s"
+msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
+
+#: composer/e-msg-composer.c:1294
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11037,35 +11223,40 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:1536
+#: composer/e-msg-composer.c:1555
+msgid "_Discard Changes"
+msgstr ""
+
+#: composer/e-msg-composer.c:1559
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Reenvia el missatge"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Signature:"
 msgstr "Fitxer de signatura:"
 
-#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:2796
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2822
+#: composer/e-msg-composer.c:2931
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11074,30 +11265,19 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/e-msg-composer.c:3858
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:393
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-
-#: composer/evolution-composer.c:408
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
 #: data/evolution.desktop.in.h:1
 #, fuzzy
 msgid "The Evolution groupware suite"
@@ -11153,8 +11333,111 @@ msgstr "L'assumpte cont�"
 msgid "Subject does not contain"
 msgstr "L'assumpte no cont�"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
-#: mail/mail-display.c:192
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:4
+#, fuzzy
+msgid "<b>Out of Office Message:</b>"
+msgstr "Fora de l'oficina"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "Descripci�:"
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:12
+#, fuzzy
+msgid "Out of Office Assistant"
+msgstr "Fora de l'oficina"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "_Estat:"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "Sendmail"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "Sendmail"
+
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:9
+#, fuzzy
+msgid "Read Receipts"
+msgstr "Destinataris"
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
+#: e-util/e-component-listener.c:128
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11162,228 +11445,254 @@ msgstr ""
 "Ja existeix una fitxer amb aquest nom.\n"
 "El voleu sobreescriure?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Voleu sobreescriure el fitxer?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr ""
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 #, fuzzy
 msgid "Sync Categories:"
 msgstr "categories"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:171 e-util/e-time-utils.c:384
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:176 e-util/e-time-utils.c:375
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:181
 #, fuzzy
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:186
 #, fuzzy
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:197
 #, fuzzy
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:201
 #, fuzzy
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:206
 #, fuzzy
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:211
 #, fuzzy
 msgid "%m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:216
 #, fuzzy
 msgid "%m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:221
 #, fuzzy
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:325 e-util/e-time-utils.c:424
 #, fuzzy
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:329 e-util/e-time-utils.c:416
 #, fuzzy
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
+#: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
+#: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:342
 #, fuzzy
 msgid "%I %p"
 msgstr "%I:%M %p"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:181
-msgid "seconds"
-msgstr "segons"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr " segons"
 
-#: filter/filter-datespec.c:71
-msgid "minute"
-msgstr "minut"
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr " segons"
 
-#: filter/filter-datespec.c:72
-msgid "hour"
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "10 minuts"
+
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "minuts"
+
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
 msgstr "hora"
 
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "setmana"
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "hores"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "Mostra 1 dia"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr "fa"
+
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "Mostra 1 setmana"
+
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
 msgstr "setmanes"
 
-#: filter/filter-datespec.c:75
-msgid "month"
+#: filter/filter-datespec.c:70
+#, fuzzy
+msgid "1 month ago"
 msgstr "mes"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
-msgstr "mesos"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr "fa"
 
-#: filter/filter-datespec.c:76
-msgid "year"
-msgstr "any"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "anys"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr "fa"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 #, fuzzy
 msgid "You must choose a date."
 msgstr "Nom de l'estil:"
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr "<feu clic aqu� per seleccionar una data>"
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "ara"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:279
+#: filter/filter-datespec.c:285
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%a %d %b"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
-#, fuzzy, c-format
-msgid "%d %s ago"
-msgstr "fa"
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "Fitxer de signatura:"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Regles del filtre"
 
-#: filter/filter-file.c:178
+#: filter/filter-file.c:166
 #, fuzzy
-msgid "You must specify a file name"
+msgid "You must specify a file name."
 msgstr "Nom de l'estil:"
 
-#: filter/filter-file.c:190
+#: filter/filter-file.c:184
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "`%s' no �s un fitxer habitual."
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 #, fuzzy
 msgid "Choose a file"
 msgstr "Fitxer de signatura:"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "Aleshores"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "Afegeix una acci�"
-
-#: filter/filter-folder.c:149
+#: filter/filter-folder.c:155
 #, fuzzy
-msgid "You must specify a folder.\n"
+msgid "You must specify a folder."
 msgstr "Nom de l'estil:"
 
-#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -11392,81 +11701,79 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:62
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
 msgid "Important"
 msgstr ""
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133
+#: filter/filter-label.c:122 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 #, fuzzy
 msgid "Work"
 msgstr "S'est� movent"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1281
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124
+#: filter/filter-label.c:124 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 #, fuzzy
 msgid "To Do"
 msgstr "Per a"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1283
 #, fuzzy
 msgid "Later"
 msgstr "despr�s de"
 
-#: filter/filter-part.c:545 shell/evolution-test-component.c:49
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 msgid "Test"
 msgstr "Comprova"
 
-#: filter/filter-rule.c:223
+#: filter/filter-rule.c:219
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Nom de la regla: "
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "Sense t�tol"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "Executa les accions"
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "si es compleixen tots els criteris"
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "si es compleix qualsevol criteri"
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "Afegeix un criteri"
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 #, fuzzy
 msgid "incoming"
 msgstr ""
 "Entrant\n"
 "Sortint\n"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 #, fuzzy
 msgid "outgoing"
 msgstr "Agrupament"
@@ -11523,7 +11830,7 @@ msgstr ""
 "La data del missatge es comparar� amb l'hora\n"
 "que indiqueu aqu�."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Carpetes virtuals"
 
@@ -11535,6 +11842,14 @@ msgstr "una hora relativa a l'actual"
 msgid "ago"
 msgstr "fa"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "mesos"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "segons"
+
 #: filter/filter.glade.h:25
 #, fuzzy
 msgid "specific folders only"
@@ -11553,6 +11868,10 @@ msgstr "una hora que indiqueu"
 msgid "vFolder Sources"
 msgstr "Fonts de la vFolder"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "setmanes"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
@@ -11566,6 +11885,10 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Crea una carpeta nova"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "anys"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11704,7 +12027,7 @@ msgstr "no �s"
 msgid "is not Flagged"
 msgstr "no �s"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 #, fuzzy
 msgid "Label"
 msgstr "etiqueta9"
@@ -11737,7 +12060,7 @@ msgstr "FIXME: Nou _missatge per contactar"
 msgid "Play Sound"
 msgstr "Final del dia:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 #, fuzzy
 msgid "Read"
 msgstr "R�dio"
@@ -11770,12 +12093,12 @@ msgstr "�s m�s gran que"
 msgid "returns less than"
 msgstr "�s m�s petit que"
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuaci�"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Remitent"
 
@@ -11815,8 +12138,9 @@ msgstr "comen�a per"
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Assumpte"
 
@@ -11825,81 +12149,97 @@ msgstr "Assumpte"
 msgid "Unset Status"
 msgstr "Estat de la connexi�"
 
-#: filter/rule-editor.c:180
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
+#, c-format
+msgid "Rule name '%s' is not unique, choose another."
+msgstr ""
+
+#: filter/rule-editor.c:170
 #, fuzzy
 msgid "Rules"
 msgstr "M�bil"
 
-#: filter/rule-editor.c:239 filter/rule-editor.c:335
-#, c-format
-msgid "Rule name '%s' is not unique, choose another"
-msgstr ""
-
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Afegeix una regla"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 #, fuzzy
 msgid "Edit Rule"
 msgstr "Filtres d'edici�"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "Nom de la regla: "
+
+#: filter/score-editor.c:114
 #, fuzzy
 msgid "Score Rules"
 msgstr "Edita la regla de puntuaci�"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Suprimeix aquest element"
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "Fonts de la vFolder"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 #, fuzzy
 msgid "Importing..."
 msgstr "S'est� movent"
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 #, fuzzy
 msgid "Please wait"
 msgstr "acaba amb"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr "S'est� movent"
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "S'est� examinant %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:353
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 #, fuzzy
 msgid "Mail"
 msgstr "_Correu"
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr ""
 
@@ -11909,12 +12249,12 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "_Prioritat:"
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11929,7 +12269,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11937,7 +12277,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11946,507 +12286,489 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
-#: shell/e-local-storage.c:183
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 #, fuzzy
 msgid "Trash"
 msgstr "Tasca"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Fitxer de correu local %s"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 #, fuzzy
 msgid "Scanning directory"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 #, fuzzy
 msgid "Starting import"
 msgstr "Data d'_inici:"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 #, fuzzy
 msgid "Settings"
 msgstr "_Par�metres"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Filtres d'edici�"
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 #, fuzzy
 msgid "Pine"
 msgstr "Imprimeix"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 #, fuzzy
 msgid "Composer Preferences"
 msgstr "Prefer�ncies de l'agenda"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 #, fuzzy
 msgid "Configure the fonts used by Evolution here"
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Configuraci� del correu"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
-msgid "Evolution mail composer."
+msgid "Evolution Mail component"
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
+msgid "Evolution Mail composer"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 #, fuzzy
-msgid "Evolution mail folder display component."
-msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
+msgid "Evolution Mail composer configuration control"
+msgstr "Configuraci� del correu"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
-msgid "Evolution mail folder factory component."
+msgid "Evolution Mail configuration interface"
+msgstr "Configuraci� del correu"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
 msgstr ""
 "No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 #, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Evolution Mail font configuration control"
+msgstr "Configuraci� del correu"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
 #, fuzzy
-msgid "Factory for the Mail Summary component."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Evolution Mail preferences control"
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
 msgid "Font Preferences"
 msgstr "Prefer�ncies"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "cont�"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Prefer�ncies"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-#, fuzzy
-msgid "Mail configuration interface"
-msgstr "Configuraci� del correu"
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "P�blic"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "Carpetes virtuals"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Carpetes virtuals"
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 #, fuzzy
 msgid "Properties..."
 msgstr "Propietats..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Propietats de la llista de coses per fer"
 
-#: mail/component-factory.c:805
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:970
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap m�tode de transport de correu"
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:998
-#, fuzzy
-msgid "Warning: Unsent Messages"
-msgstr "Reenvia el missatge"
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 #, fuzzy
 msgid "New Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 #, fuzzy
 msgid "_Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Redacta un missatge"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "_Missatge"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "_Imprimeix el missatge"
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:1078
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#: mail/component-factory.c:1087
-#, fuzzy
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#: mail/component-factory.c:1093
-#, fuzzy
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propietats..."
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 #, fuzzy
 msgid "Properties"
 msgstr "Propietats..."
 
-#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:794
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Suprimeix"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " segons"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr " segons"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "VFolder sobre el remite_nt"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "VFolder sobre els destinata_ris"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "_Anomena i desa..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1771
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "% comp_let:"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Agenda"
 
 #. separator here?
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Suprimeix"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mou a la carpeta"
 
-#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta"
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Desa a la llibreta d'adreces"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default"
 msgstr "Valors predeterminats"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 #, fuzzy
 msgid "Getting Folder Information"
 msgstr "Cap informaci�"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Factory to import mbox into Evolution"
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Evolution Elm importer"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
 #: mail/local-config.glade.h:1
 #, fuzzy
 msgid "Current store format:"
@@ -12483,108 +12805,108 @@ msgstr ""
 msgid "mh"
 msgstr "h"
 
-#: mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:159
+#: mail/mail-account-editor.c:146
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Host:"
 msgstr "Hores"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Nom d'usuari:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Path:"
 msgstr "Cam�:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 #, fuzzy
 msgid "Don't delete"
 msgstr "Suprimeix"
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr ""
-
-#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 #, fuzzy
 msgid "Disable"
 msgstr "Inhabilitat"
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
+#, fuzzy
+msgid "[Default]"
+msgstr "Valors predeterminats"
+
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 #, fuzzy
 msgid "Enabled"
 msgstr "Inhabilitat"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "cont�"
 
-#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Correu per a %s"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "Assumpte"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Correu de %s"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: mail/mail-autofilter.c:376
+#: mail/mail-autofilter.c:372
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12592,7 +12914,13 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:154
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
+#, fuzzy
+msgid "Don't show this message again."
+msgstr "Envia aquest missatge"
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -12604,7 +12932,16 @@ msgstr ""
 "rebre o redactar correu.\n"
 "El voleu configurar ara?"
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:211
+#, fuzzy
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Cal que configureu una identitat\n"
+"abans de poder redactar correu."
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12612,7 +12949,7 @@ msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12621,18 +12958,18 @@ msgstr ""
 "abans de poder redactar correu."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:254
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
 #, fuzzy
 msgid "Send anyway?"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12640,59 +12977,59 @@ msgstr ""
 "Aquest missatge no t� cap assumpte.\n"
 "Voleu que l'envi� igualment?"
 
-#: mail/mail-callbacks.c:356
+#: mail/mail-callbacks.c:313
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-callbacks.c:364
+#: mail/mail-callbacks.c:322
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Cal que indiqueu els destinataris per poder enviar aquest missatge."
 
-#: mail/mail-callbacks.c:777
+#: mail/mail-callbacks.c:722
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1187
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Error desconegut"
 
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2344
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12700,7 +13037,7 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -12709,52 +13046,55 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2403
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
 #, fuzzy
 msgid "No Message Selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "Voleu sobreescriure el fitxer?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"No es pot obrir la ubicaci� `%s':\n"
+"%s"
+
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Ja existeix una fitxer amb aquest nom.\n"
+"El voleu sobreescriure?"
 
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2511
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2513
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:2655
-#, fuzzy
-msgid "Go to next folder with unread messages?"
-msgstr "Imprimeix el missatge seleccionat"
-
-#: mail/mail-callbacks.c:2662
-msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2905
+#: mail/mail-callbacks.c:2687
 msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12763,90 +13103,104 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtres de correu ..."
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:3156
-msgid "US-Letter"
-msgstr ""
-
-#: mail/mail-callbacks.c:3197
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: mail/mail-callbacks.c:3387
+#: mail/mail-callbacks.c:3147
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-composer-prefs.c:223
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+#, fuzzy
+msgid "Unnamed"
+msgstr "Contacte _nou"
 
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
+#: mail/mail-composer-prefs.c:335
 #, fuzzy
-msgid " [script]"
-msgstr "Descripci�:"
+msgid "You must specify a valid script name."
+msgstr "Nom de l'estil:"
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
-msgstr ""
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+#, fuzzy
+msgid "[script]"
+msgstr "Descripci�:"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
+#: mail/mail-composer-prefs.c:864
 #, fuzzy
-msgid "Unnamed"
-msgstr "Contacte _nou"
+msgid "Language(s)"
+msgstr "Busca"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
 #, fuzzy
 msgid "Add script signature"
 msgstr "Afegeix un criteri"
 
-#: mail/mail-composer-prefs.c:876
+#: mail/mail-composer-prefs.c:926
 #, fuzzy
-msgid "Add Signature"
+msgid "Signature(s)"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Identitat"
+
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "Sendmail"
+
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Sendmail"
+
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12855,156 +13209,137 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:637
-#, fuzzy
-msgid "Evolution Account Assistant"
-msgstr "Conducte de les coses per fer de l'Evolution"
-
-#: mail/mail-config.c:622
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "cont�"
-
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2394 mail/mail-config.c:2398
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid " _Check for supported types "
 msgstr "Detecta els tipus suportats..."
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr ""
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Account Editor"
 msgstr "cont�"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Afegeix un criteri"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "adjunci�"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Authentication"
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Error desconegut: %s"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "C_olors"
 msgstr "Tanca"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Element per fer que ven� avui:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Redacta un missatge"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -13012,325 +13347,323 @@ msgid ""
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
 "Ja teniu enllestida la configuraci� del correu.\n"
 "Feu clic a \"Finalitza\" per desar els nous par�metres"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "De_fault"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 #, fuzzy
 msgid "Done"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Creaci� d'una nova carpeta"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "E_nable"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Emacs"
 msgstr "�ltim"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "cont�"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "Adre�a electr�nica:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Evolution Account Assistant"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executa les accions"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "acaba amb"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propietats de l'adjunci�"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Ressalta els elemts que vencen avui"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Identitat"
-
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Inline"
 msgstr "Visualitza en l�nia"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Desa i tanca"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Format"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cos del missatge"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "Esborra la visualitzaci� del missatge"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "cont�"
+
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Microsoft"
 msgstr "�s"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "On Screen fonts"
-msgstr ""
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Optional Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organitzaci�:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Agafa un color"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimeix els contactes"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Adre�a electr�nica 2"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quote original message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quoted"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Desa com a VCard"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Respon"
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Data de recepci�"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Desa com a VCard"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Required Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Agenda"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Mostra la barra de _dreceres"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nom de l'estil:"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr ""
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
@@ -13368,7 +13701,7 @@ msgstr "Inhabilitat"
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 
 #: mail/mail-config.glade.h:134
@@ -13442,119 +13775,123 @@ msgid "_Enable"
 msgstr "Inhabilitat"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Reenvia"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nom complet:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitat"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marca el missatge com a vist [ms]: "
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Name:"
 msgstr "Nom:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Respon a tots"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Script:"
 msgstr "Descripci�:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Mostra"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:175
-msgid "_Use secure connection (SSL):"
+#: mail/mail-config.glade.h:174
+msgid "_Standard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:175
 #, fuzzy
-msgid "_Variable-width:"
-msgstr "Inhabilitat"
+msgid "_Terminal Font:"
+msgstr "Autor original:"
+
+#: mail/mail-config.glade.h:176
+msgid "_Use secure connection (SSL):"
+msgstr ""
 
 #: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_every"
 msgstr "Cada"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "color"
 msgstr "Colors"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "description"
 msgstr "Descripci�:"
@@ -13584,196 +13921,200 @@ msgstr "No s'ha pogut crear el quadre de di�leg."
 msgid "Could not create a S/MIME decode context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Ja existeix una fitxer amb aquest nom.\n"
+"El voleu sobreescriure?"
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Visualitza en l�nia"
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualitza en l�nia (mitjan�ant %s)"
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Amaga"
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Visualitzador extern"
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
 #, fuzzy
 msgid "Downloading images"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
 #, fuzzy
 msgid "Loading message content"
 msgstr "S'estan reenviant els missatges \"%s\""
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
 #, fuzzy
 msgid "Overdue:"
 msgstr "Elements que ja han ven�ut:"
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2240
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Obre'l en una nova finestra"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Contacte (FIXME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Tasca (FIXME)"
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "S'est� examinant %s"
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunci�"
 
-#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
-#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
 #, fuzzy
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 
-#: mail/mail-format.c:783 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Date"
 msgstr "Data de venciment"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:845
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adre�a electr�nica:"
 
-#: mail/mail-format.c:913 mail/message-list.etspec.h:7
-#: mail/message-tags.glade.h:3
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 #, fuzzy
 msgid "Reply-To"
 msgstr "Respon"
 
-#: mail/mail-format.c:922 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Per a"
 
-#: mail/mail-format.c:927
+#: mail/mail-format.c:900
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:932
+#: mail/mail-format.c:905
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:963
-#, fuzzy
-msgid "Mailer"
-msgstr "_Correu"
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1892
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Carpetes virtuals"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:748
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13782,12 +14123,12 @@ msgstr ""
 "No es pot desar la informaci� meta de la carpeta; probablement\n"
 "no la podreu tornar a obrir: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
@@ -13799,7 +14140,7 @@ msgstr ""
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'est� convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:1351
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13807,12 +14148,12 @@ msgstr ""
 "Si ja no podeu obrir aquesta b�stia de correu\n"
 "potser us caldr� reparar-la manualment."
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
@@ -13834,196 +14175,195 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 #, fuzzy
 msgid "Working"
 msgstr "S'est� movent"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Fi_ltre sobre el remitent"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Sendmail"
 
-#: mail/mail-ops.c:553 mail/mail-ops.c:582
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'est� enviant \"%s\""
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "S'est� marcant el missatge %d de %d"
 
-#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
 #, fuzzy
 msgid "Complete."
 msgstr "% comp_let:"
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'est� esborrant \"%s\""
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-#, fuzzy
-msgid "_Search"
-msgstr "Cerca"
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(Sense t�tol)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Mou el missatge"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 #, fuzzy
 msgid "Empty Message"
 msgstr "_Edita el missatge"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 #, fuzzy
 msgid "Find in Message"
 msgstr "_Edita el missatge"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "Cerca"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 #, fuzzy
 msgid "Search Forward"
 msgstr "Reenvia"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 #, fuzzy
 msgid "Find:"
 msgstr "Cerca"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 #, fuzzy
 msgid "Matches:"
 msgstr "Cam�:"
@@ -14033,78 +14373,73 @@ msgstr "Cam�:"
 msgid "Cancelling..."
 msgstr "Cancel�lat"
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor:"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tipus:"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 #, fuzzy
 msgid "Cancel All"
 msgstr "Cancel�lat"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 #, fuzzy
 msgid "Updating..."
 msgstr "_Par�metres"
 
-#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
 #, fuzzy
 msgid "Waiting..."
 msgstr "_Par�metres"
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 #, fuzzy
 msgid "User canceled operation."
 msgstr "Consulta cancel�lada per l'usuari."
 
-#: mail/mail-session.c:272
-#, fuzzy
-msgid "_Remember this password"
-msgstr "Desa com a VCard"
-
-#: mail/mail-session.c:273
-msgid "_Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-session.c:330
+#: mail/mail-session.c:258
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 #, fuzzy
 msgid "Enter Password"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:280
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Desa com a VCard"
+
+#: mail/mail-session.c:281
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-signature-editor.c:80
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr ""
 "No s'ha pogut obrir el fitxer de signatura %s:\n"
 "%s"
 
-#: mail/mail-signature-editor.c:175
-#, fuzzy
-msgid "Save signature"
-msgstr "Fitxer de signatura:"
-
-#: mail/mail-signature-editor.c:181
+#: mail/mail-signature-editor.c:226
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -14115,46 +14450,55 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: mail/mail-signature-editor.c:333
+#: mail/mail-signature-editor.c:229
+msgid "_Discard changes"
+msgstr ""
+
+#: mail/mail-signature-editor.c:233
+#, fuzzy
+msgid "Save signature"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-signature-editor.c:389
 #, fuzzy
 msgid "Edit signature"
 msgstr "Afegeix un criteri"
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:429
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Nom:"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Reenvia el missatge"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "S'est� carregant la carpeta %s"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -14163,110 +14507,110 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 #, fuzzy
 msgid "vFolders"
 msgstr "Carpetes"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Edita les VFolders"
 
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 #, fuzzy
 msgid "(No subject)"
 msgstr "Re: (sense assumpte)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "_Missatge"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Mou el missatge"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 #, fuzzy
 msgid "Lowest"
 msgstr "Baixa"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 #, fuzzy
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 #, fuzzy
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 #, fuzzy
 msgid "Highest"
 msgstr "Alta"
 
-#: mail/message-list.c:1066
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:1087
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1118
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:2568
+#: mail/message-list.c:2614
 #, fuzzy
 msgid "Generating message list"
 msgstr "C�pia de missatges"
@@ -14303,47 +14647,47 @@ msgstr "Data de recepci�"
 msgid "Size"
 msgstr "Mida"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
 msgstr "Crida de retorn"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "V�s endavant en el temps"
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:64
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:65
 #, fuzzy
 msgid "For Your Information"
 msgstr "Cap informaci�"
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Reenvia"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Respon"
 
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Respon a tots"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 #, fuzzy
 msgid "Review"
 msgstr "Previsualitzaci�:"
 
-#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "FIXME: _Assenyala per al seguiment..."
@@ -14374,56 +14718,46 @@ msgstr "Data de venciment"
 msgid "_Flag:"
 msgstr "Nom del fitxer:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetes"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Desa a la _carpeta..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 #, fuzzy
 msgid "No server has been selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:1
-#, fuzzy
-msgid "All folders"
-msgstr "Carpetes"
-
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "abril"
-
 #: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -14436,72 +14770,51 @@ msgstr "Tanca"
 
 #: mail/subscribe-dialog.glade.h:4
 #, fuzzy
-msgid "Display Options"
-msgstr "Opcions de visualitzaci�"
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:6
-#, fuzzy
 msgid "Manage Subscriptions"
 msgstr "Gestiona les subscripcions..."
 
-#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Refresca la llista"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Seleccioneu una carpeta"
 
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "Fitxer de signatura:"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 #, fuzzy
 msgid "_Subscribe"
 msgstr "Subscriu-me"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "Cancel�la la subscripci�"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for the Evolution Summary."
-msgstr ""
-"Utilitat de configuraci� per al conducte de les coses per fer de "
-"l'Evolution.\n"
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr ""
 "Utilitat de configuraci� per al conducte de les coses per fer de "
 "l'Evolution.\n"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Summary component."
+msgid "Evolution Summary"
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
 #, fuzzy
-msgid "Factory for Evolution Summary's configuration control."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Evolution Summary component"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
 #, fuzzy
-msgid "Factory for the Evolution Summary component."
+msgid "Evolution Summary configuration control"
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 #, fuzzy
 msgid "Summary Preferences"
 msgstr "Prefer�ncies"
@@ -18219,7 +18532,7 @@ msgid "Hagerstown"
 msgstr ""
 
 #. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
 #, fuzzy
 msgid "Hail"
 msgstr "_Correu"
@@ -20047,6501 +20360,6488 @@ msgid "Marion-Wytheville"
 msgstr ""
 
 #: my-evolution/Locations.h:1325
-#, fuzzy
-msgid "Marquette"
-msgstr "Minut"
-
-#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 #, fuzzy
 msgid "Marshall"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 #, fuzzy
 msgid "Marte"
 msgstr "Minut"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Marca'l com a per _llegir"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Minut"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsville"
 msgstr "Minut"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Maryland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 #, fuzzy
 msgid "Masirah"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 #, fuzzy
 msgid "Massena"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Matamoros"
 msgstr "Colors"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 #, fuzzy
 msgid "Mattoon"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Busca"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayport"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mazatlan"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazu"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 #, fuzzy
 msgid "McCall"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCarthy"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McComb"
 msgstr "Copia"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 #, fuzzy
 msgid "Meacham"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Medford"
 msgstr "abans de"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 #, fuzzy
 msgid "Mehamn"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 #, fuzzy
 msgid "Melfa"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 #, fuzzy
 msgid "Mendoza"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 #, fuzzy
 msgid "Merida"
 msgstr "Divendres"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 #, fuzzy
 msgid "Mexicali"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 #, fuzzy
 msgid "Miami"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 #, fuzzy
 msgid "Middle East"
 msgstr "_Mig:"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middletown"
 msgstr "_Mig:"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Midland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 #, fuzzy
 msgid "Miles City"
 msgstr "Nom del fitxer:"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Milford"
 msgstr "per a"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 #, fuzzy
 msgid "Milton"
 msgstr "Envia per correu _a:"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minchumina"
 msgstr ""
 "Entrant\n"
 "Sortint\n"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 #, fuzzy
 msgid "Minnesota"
 msgstr "Minuts"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 #, fuzzy
 msgid "Minot"
 msgstr "no �s"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 #, fuzzy
 msgid "Missoula"
 msgstr "�s"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missouri"
 msgstr "�s"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Mitchell"
 msgstr "Cam�:"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitilini"
 msgstr "Llista de correu %s"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 #, fuzzy
 msgid "Miyazaki Airport"
 msgstr "Transport de correu"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 #, fuzzy
 msgid "Moa"
 msgstr "Dl"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 #, fuzzy
 msgid "Mobridge"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Modesto"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 #, fuzzy
 msgid "Mojave"
 msgstr "Mou"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Molde"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Moldova"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 #, fuzzy
 msgid "Molokai"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 #, fuzzy
 msgid "Monclova"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Moncton"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Monida"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 #, fuzzy
 msgid "Monroe"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Montague"
 msgstr "Busca"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montana"
 msgstr "cont�"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Mes"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 #, fuzzy
 msgid "Monterey"
 msgstr "Mes"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 #, fuzzy
 msgid "Monticello"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Montpelier"
 msgstr "Mes"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 #, fuzzy
 msgid "Montrose"
 msgstr "Lletres"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Morelia"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organitzaci�"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Moriarty"
 msgstr "Primari"
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 #, fuzzy
 msgid "Mosinee"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 #, fuzzy
 msgid "Mountain View"
 msgstr "Mes"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "Fonts"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Mes"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 #, fuzzy
 msgid "Mullan"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 #, fuzzy
 msgid "Muncie"
 msgstr "juny"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 #, fuzzy
 msgid "Murcia"
 msgstr "agost"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 #, fuzzy
 msgid "Mus"
 msgstr "Ocupat"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Muscatine"
 msgstr "Minut"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 #, fuzzy
 msgid "Mykonos"
 msgstr "Lletres"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 #, fuzzy
 msgid "Namsos"
 msgstr "Nom"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 #, fuzzy
 msgid "Nanning"
 msgstr "S'est� movent"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 #, fuzzy
 msgid "Napa"
 msgstr "Recupera el correu"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Naples"
 msgstr "Nom"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Napoli"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Narvik"
 msgstr "_Sobrenom:"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 #, fuzzy
 msgid "Natal"
 msgstr "avui"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natchez"
 msgstr "Cam�:"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 #, fuzzy
 msgid "Nebraska"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 #, fuzzy
 msgid "Needles"
 msgstr "dc."
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 #, fuzzy
 msgid "Nenana"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 #, fuzzy
 msgid "Nevada"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Newark"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "New Bedford"
 msgstr "Servidors de not�cies"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bern"
 msgstr "Nova a_genda"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 #, fuzzy
 msgid "Newcastle"
 msgstr "Nou"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Recupera el correu"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Recupera el correu"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 #, fuzzy
 msgid "New Haven"
 msgstr "Nova a_genda"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Iberia"
 msgstr "Visualitza tots els contactes"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Jersey"
 msgstr "_Missatge"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Mexico"
 msgstr ""
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Orleans"
 msgstr "Selecciona'ls _tots"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 #, fuzzy
 msgid "Newport"
 msgstr "quart"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 #, fuzzy
 msgid "New River"
 msgstr "Nova a_genda"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 #, fuzzy
 msgid "Newton"
 msgstr "Nou"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "New York"
 msgstr "Nova VFolder"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "Dimensions:"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nipawin"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nis"
 msgstr "�s"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 #, fuzzy
 msgid "Nogales"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nome"
 msgstr "Nom"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Norfolk"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 #, fuzzy
 msgid "Norrkoping"
 msgstr "S'est� movent"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "North Adams"
 msgstr "No_tes:"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Bend"
 msgstr "quart"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 #, fuzzy
 msgid "North Conway"
 msgstr "Ara"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Dakota"
 msgstr "No_tes:"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 #, fuzzy
 msgid "North Platte"
 msgstr "No_tes:"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "Northway"
 msgstr "Ara"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norwich"
 msgstr "quart"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwood"
 msgstr "Ara"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Notodden"
 msgstr "Cap"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "No iniciat"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 #, fuzzy
 msgid "Oahu"
 msgstr "Opac"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 #, fuzzy
 msgid "Oakland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 #, fuzzy
 msgid "Ocala"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Odense"
 msgstr "_Obre"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Oelwen"
 msgstr "_Obre"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Ogden"
 msgstr "_Obre"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 #, fuzzy
 msgid "Ohrid"
 msgstr "Altres"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Olathe"
 msgstr "Altres"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 #, fuzzy
 msgid "Omak"
 msgstr "D'acord"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 #, fuzzy
 msgid "Omsk"
 msgstr "D'acord"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 #, fuzzy
 msgid "Ontario"
 msgstr "Orientaci�"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Oostende"
 msgstr "Tots els assistents"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oran"
 msgstr "Cancel�lat"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 #, fuzzy
 msgid "Orange"
 msgstr "Cancel�lat"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 #, fuzzy
 msgid "Oregon"
 msgstr "Seccions:"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 #, fuzzy
 msgid "Orland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orlando"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 #, fuzzy
 msgid "Oruro"
 msgstr "Cap error"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 #, fuzzy
 msgid "Oscoda"
 msgstr "segon"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 #, fuzzy
 msgid "Owyhee"
 msgstr "setmana"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Oxford"
 msgstr "per a"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 #, fuzzy
 msgid "Paganella"
 msgstr "P�gina"
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 #, fuzzy
 msgid "Palermo"
 msgstr "Busca"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 #, fuzzy
 msgid "Palmer"
 msgstr "Busca"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palm Springs"
 msgstr "_Par�metres"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 #, fuzzy
 msgid "Pamplona"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 #, fuzzy
 msgid "Panama City"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Cancel�lat"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Papa"
 msgstr "Paper"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Paphos"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 #, fuzzy
 msgid "Paris"
 msgstr "Primari"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "Vertical"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 #, fuzzy
 msgid "Pasco"
 msgstr "Contrasenya"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 #, fuzzy
 msgid "Patna"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 #, fuzzy
 msgid "Paysandu"
 msgstr "Final del dia:"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Payson"
 msgstr "Final del dia:"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Pellston"
 msgstr "Descripci�:"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pelotas"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pendleton"
 msgstr "Seccions:"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 #, fuzzy
 msgid "Peoria"
 msgstr "Primari"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 #, fuzzy
 msgid "Perm"
 msgstr "Primari"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 #, fuzzy
 msgid "Perth"
 msgstr "Paper"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 #, fuzzy
 msgid "Perugia"
 msgstr "Paper"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 #, fuzzy
 msgid "Pierre"
 msgstr "Paper"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 #, fuzzy
 msgid "Pikeville"
 msgstr "Previsualitzaci�:"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pine Bluff"
 msgstr "Adre�a electr�nica principal"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 #, fuzzy
 msgid "Pisa"
 msgstr "Enganxa"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 #, fuzzy
 msgid "Plymouth"
 msgstr "mes"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 #, fuzzy
 msgid "Point Hope"
 msgstr "Imprimeix el missatge..."
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Lay"
 msgstr "R_esum"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Imprimeix el missatge"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 #, fuzzy
 msgid "Poitiers"
 msgstr "Propietats..."
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 #, fuzzy
 msgid "Ponca City"
 msgstr "Tipus de tel�fon"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponce"
 msgstr "Cap"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 #, fuzzy
 msgid "Pontiac"
 msgstr "_Contactes..."
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 #, fuzzy
 msgid "Poprad"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Imprimeix l'agenda"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 #, fuzzy
 msgid "Port Angeles"
 msgstr "Imprimeix el missatge..."
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 #, fuzzy
 msgid "Porterville"
 msgstr "Previsualitzaci�:"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Imprimeix l'agenda"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 #, fuzzy
 msgid "Portland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Porto"
 msgstr "Prioritat:"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "En proc�s"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 #, fuzzy
 msgid "Portoroz"
 msgstr "Vertical"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Vertical"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 #, fuzzy
 msgid "Port Said"
 msgstr "Vertical"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 #, fuzzy
 msgid "Posadas"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poznan"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Praha"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Previsualitzaci� d'impressi�"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 #, fuzzy
 msgid "Pretoria"
 msgstr "Vertical"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Preveza"
 msgstr "Anterior"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Pristina"
 msgstr "Opcions"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Providence"
 msgstr "_Comarca:"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Provincetown"
 msgstr "Previsualitzaci�:"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provo"
 msgstr "Anterior"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 #, fuzzy
 msgid "Puebla"
 msgstr "P�blic"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Pueblo"
 msgstr "P�blic"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Descripci�:"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "R_esum"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 #, fuzzy
 msgid "Pula"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pullman"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Imprimeix l'agenda"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 #, fuzzy
 msgid "Quantico"
 msgstr "Descripci�:"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quebec"
 msgstr "Assumpte"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 #, fuzzy
 msgid "Rapid City"
 msgstr "Respon a tots"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 #, fuzzy
 msgid "Rawlins"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Reading"
 msgstr "Encap�alaments"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Recife"
 msgstr "Data de recepci�"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 #, fuzzy
 msgid "Redding"
 msgstr "Encap�alaments"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redig"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redmond"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 #, fuzzy
 msgid "Regina"
 msgstr "Seccions:"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 #, fuzzy
 msgid "Rennes"
 msgstr "Recordatoris"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Reno"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Renton"
 msgstr "Seccions:"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 #, fuzzy
 msgid "Reus"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reyes"
 msgstr "anys"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 #, fuzzy
 msgid "Reynosa"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Riberalta"
 msgstr "abril"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "_Sobrenom:"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rieti"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rifle"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rijeka"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rimini"
 msgstr "min."
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
 #, fuzzy
 msgid "Rioja"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
 #, fuzzy
 msgid "Rivera"
 msgstr "abril"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
 #, fuzzy
 msgid "Rivne"
 msgstr "Imprimeix"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Riyadh"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
 #, fuzzy
 msgid "Roatan"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Robore"
 msgstr "abans de"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
 #, fuzzy
 msgid "Rockland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
 #, fuzzy
 msgid "Rodos"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rogers"
 msgstr "Carpetes"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
 #, fuzzy
 msgid "Roosevelt"
 msgstr "set�"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
 #, fuzzy
 msgid "Roros"
 msgstr "Colors"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
 #, fuzzy
 msgid "Rosario"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
 #, fuzzy
 msgid "Roseglen"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Rost"
 msgstr "Hores"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "Recurr�ncia"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 #, fuzzy
 msgid "Russia"
 msgstr "agost"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Rutland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
 #, fuzzy
 msgid "Sacramento"
 msgstr "_Departament:"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
 #, fuzzy
 msgid "Saginaw"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "Imprimeix l'agenda"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saiq"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Salem"
 msgstr "Desa"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salida"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
 #, fuzzy
 msgid "Salina"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salinas"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
 #, fuzzy
 msgid "Salmon"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
 #, fuzzy
 msgid "Salta"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
 #, fuzzy
 msgid "Salto"
 msgstr "ds."
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
 msgid "Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
 #, fuzzy
 msgid "Samara"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samos"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samsun"
 msgstr "dg."
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Sana'A"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
 #, fuzzy
 msgid "San Carlos"
 msgstr "Desa i tanca"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "Sandane"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandberg"
 msgstr "Remitent"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sanderson"
 msgstr "Remitent"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
 #, fuzzy
 msgid "Sanford"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 #, fuzzy
 msgid "Sangju"
 msgstr "Ombrejat"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Jose"
 msgstr "Desa i tanca"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
 #, fuzzy
 msgid "San Juan"
 msgstr "dg."
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santander"
 msgstr "Remitent"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santarem"
 msgstr "despr�s de"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
 msgid "Santorini"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santos"
 msgstr "_Estat:"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
 #, fuzzy
 msgid "Sarasota"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
 #, fuzzy
 msgid "Sarzana"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
 #, fuzzy
 msgid "Sayun"
 msgstr "dg."
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Scatsta"
 msgstr "_Estat:"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
 #, fuzzy
 msgid "Scranton"
 msgstr "Organitzaci�"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "_Par�metres"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Sedalia"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Seeb"
 msgstr "Vist"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "Data d'_inici:"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
 #, fuzzy
 msgid "Seward"
 msgstr "Cerca"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
 #, fuzzy
 msgid "Shanghai"
 msgstr "Ombrejat"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
 #, fuzzy
 msgid "Sharjah"
 msgstr "Cerca"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
 #, fuzzy
 msgid "Sharurah"
 msgstr "Dissabte"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Shawbury"
 msgstr "Dissabte"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shearwater"
 msgstr "Data d'ini_ci:"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
 #, fuzzy
 msgid "Sheldon"
 msgstr "Vist"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
 #, fuzzy
 msgid "Shelton"
 msgstr "Seccions:"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
 #, fuzzy
 msgid "Sheridan"
 msgstr "dg."
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
 #, fuzzy
 msgid "Shiraz"
 msgstr "Mida"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
 #, fuzzy
 msgid "Shoreham"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Show Low"
 msgstr "Mostra 1 setmana"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
 #, fuzzy
 msgid "Sidney"
 msgstr "Imprimeix"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
 msgid "Silver City"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
 #, fuzzy
 msgid "Skive"
 msgstr "Mida"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skopje"
 msgstr "Atura"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skwentna"
 msgstr "Vist"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Slana"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 #, fuzzy
 msgid "Smithers"
 msgstr "minuts"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Sochi"
 msgstr "quart"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Socorro"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socotra"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 #, fuzzy
 msgid "Sofia"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Somerset"
 msgstr "Mostra"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Remitent"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
 #, fuzzy
 msgid "Southampton"
 msgstr "Fonts"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "South Bend"
 msgstr "quart"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 msgid "South Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Dakota"
 msgstr "Fonts"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "Southend"
 msgstr "quart"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
 #, fuzzy
 msgid "Spencer"
 msgstr "Remitent"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
 #, fuzzy
 msgid "Split"
 msgstr "�s"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Spokane"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
 #, fuzzy
 msgid "Springfield"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
 #, fuzzy
 msgid "State College"
 msgstr "Data completa:"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "Stauning"
 msgstr "_Par�metres"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
 #, fuzzy
 msgid "Staverton"
 msgstr "_Par�metres"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Stavropol"
 msgstr "Atura"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
 #, fuzzy
 msgid "Stephenville"
 msgstr "Seleccioneu una carpeta"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "St. George"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
 #, fuzzy
 msgid "St Joseph"
 msgstr "Atura"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Louis"
 msgstr "Atura la c�rrega"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Stornoway"
 msgstr "Ara"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "St Paul"
 msgstr "_Estat:"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
 #, fuzzy
 msgid "Strevell"
 msgstr "Subscriu-me"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "Dissabte"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
 #, fuzzy
 msgid "Sucre"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumter"
 msgstr "R_esum"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
 #, fuzzy
 msgid "Sutton"
 msgstr "dg."
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Opcions"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 #, fuzzy
 msgid "Tabuk"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
 #, fuzzy
 msgid "Tacna"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
 #, fuzzy
 msgid "Taejon"
 msgstr "Aleshores"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
 #, fuzzy
 msgid "Taif"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Tainan"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 #, fuzzy
 msgid "Taiyuan"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiz"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Tajima"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
 #, fuzzy
 msgid "Tallinn"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
 #, fuzzy
 msgid "Tampa"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
 #, fuzzy
 msgid "Tampere"
 msgstr "Paper"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
 #, fuzzy
 msgid "Tanana"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
 #, fuzzy
 msgid "Taos"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taoyuan"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
 #, fuzzy
 msgid "Taranto"
 msgstr "Transparent"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Tarbes"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarija"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
 #, fuzzy
 msgid "Tatalina"
 msgstr "Opcions"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
 #, fuzzy
 msgid "Tela"
 msgstr "T�lex"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Temple"
 msgstr "T�lex"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
 #, fuzzy
 msgid "Texas"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "The Dalles"
 msgstr "Seleccioneu una carpeta"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
 #, fuzzy
 msgid "Thisted"
 msgstr "_T�tol:"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
 #, fuzzy
 msgid "Thumrait"
 msgstr "Dijous"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Tianjin"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tijuana"
 msgstr "vuit�"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Timisoara"
 msgstr "Format de l'hora"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
 #, fuzzy
 msgid "Tirana"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tiree"
 msgstr "setmana"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
 #, fuzzy
 msgid "Titusville"
 msgstr "_T�tol:"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Tivat"
 msgstr "Privat"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
 #, fuzzy
 msgid "Toledo"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 #, fuzzy
 msgid "Tonopah"
 msgstr "Avui"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Topeka"
 msgstr "Superior:"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
 #, fuzzy
 msgid "Torp"
 msgstr "Superior:"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torrance"
 msgstr "Cancel�lat"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 msgid "Torreon"
 msgstr ""
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "Data d'_inici:"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Toulouse"
 msgstr "Tanca"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trapani"
 msgstr "Transparent"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
 #, fuzzy
 msgid "Trelew"
 msgstr "T�lex"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trenton"
 msgstr "Orientaci�"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trevico"
 msgstr "Ant_erior"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
 #, fuzzy
 msgid "Trieste"
 msgstr "Comprova"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
 #, fuzzy
 msgid "Truckee"
 msgstr "dm."
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
 #, fuzzy
 msgid "Tulcea"
 msgstr "Dimarts"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulsa"
 msgstr "Dimarts"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tupelo"
 msgstr "dm."
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Turaif"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turin"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 #, fuzzy
 msgid "Turku"
 msgstr "dm."
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
 #, fuzzy
 msgid "Twenthe"
 msgstr "des�"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
 #, fuzzy
 msgid "Tyler"
 msgstr "Tipus:"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
 #, fuzzy
 msgid "Tyumen"
 msgstr "dm."
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "Mou el missatge"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 #, fuzzy
 msgid "Unst"
 msgstr "No vist"
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
 #, fuzzy
 msgid "Utah"
 msgstr "4"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 #, fuzzy
 msgid "Vadso"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Inhabilitat"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vagar"
 msgstr "Busca"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 #, fuzzy
 msgid "Valdosta"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
 #, fuzzy
 msgid "Valencia"
 msgstr "Agenda"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valentine"
 msgstr "Visualitza en l�nia"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
 #, fuzzy
 msgid "Van"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 #, fuzzy
 msgid "Vandel"
 msgstr "Cancel�lat"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
 #, fuzzy
 msgid "Varadero"
 msgstr "Inhabilitat"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
 #, fuzzy
 msgid "Varna"
 msgstr "Inhabilitat"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Vasteras"
 msgstr "despr�s de"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
 msgid "Venezia"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 msgid "Venice"
 msgstr ""
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 #, fuzzy
 msgid "Vermont"
 msgstr "mes"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vernal"
 msgstr "General"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
 msgid "Vicenza"
 msgstr ""
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
 #, fuzzy
 msgid "Vilhena"
 msgstr "Nom del fitxer:"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
 #, fuzzy
 msgid "Villahermosa"
 msgstr "Alarmes visuals"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
 #, fuzzy
 msgid "Visalia"
 msgstr "Alarmes visuals"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
 #, fuzzy
 msgid "Vlieland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 #, fuzzy
 msgid "Volkel"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volk Field"
 msgstr "Camps"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 #, fuzzy
 msgid "Waco"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
 #, fuzzy
 msgid "Warner Robins"
 msgstr "S'est� movent"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 #, fuzzy
 msgid "Waterbury"
 msgstr "Altres"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterloo"
 msgstr "Altres"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Watertown"
 msgstr "Altres"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Waterville"
 msgstr "categories"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Wejh"
 msgstr "Dc"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Altres"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wendover"
 msgstr "Remitent"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "Westerland"
 msgstr "Selecciona'ls _tots"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westfield"
 msgstr "Comprova"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westhampton"
 msgstr "La setmana comen�a el"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
 #, fuzzy
 msgid "Wheeling"
 msgstr "Seleccioneu una carpeta"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
 #, fuzzy
 msgid "Wick"
 msgstr "_Sobrenom:"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wien"
 msgstr "Dc"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
 #, fuzzy
 msgid "Williamsport"
 msgstr "Transport de correu"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
 #, fuzzy
 msgid "Williston"
 msgstr "�s"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 #, fuzzy
 msgid "Winslow"
 msgstr "ara"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
 #, fuzzy
 msgid "Winter Park"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
 #, fuzzy
 msgid "Wisconsin"
 msgstr "segons"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
 #, fuzzy
 msgid "Wise"
 msgstr "Dc"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Wooster"
 msgstr "Peu de p�gina:"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Worcester"
 msgstr "per sempre"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worthington"
 msgstr "S'est� movent"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
 #, fuzzy
 msgid "Wyoming"
 msgstr "S'est� movent"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Xiamen"
 msgstr "Nom"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
 #, fuzzy
 msgid "Yao Airport"
 msgstr "No l'eliminis"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
 #, fuzzy
 msgid "Yenbo"
 msgstr "Vist"
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
 #, fuzzy
 msgid "Zadar"
 msgstr "Agenda"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zagreb"
 msgstr "P�gina"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
 #, fuzzy
 msgid "Zanesville"
 msgstr "Cancel�lat"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 msgid "Zaragoza"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
 #, fuzzy
 msgid "Zurich"
 msgstr "Tasca"
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
+#: my-evolution/e-summary-calendar.c:380
 #, fuzzy
 msgid "Appointments"
 msgstr "Cites:"
 
-#: my-evolution/e-summary-calendar.c:382
+#: my-evolution/e-summary-calendar.c:388
 #, fuzzy
-msgid "No appointments"
+msgid "No appointments."
 msgstr "Mostra les hores d'acabament de les cites"
 
-#: my-evolution/e-summary-calendar.c:418
+#: my-evolution/e-summary-calendar.c:405
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-calendar.c:420
+#: my-evolution/e-summary-calendar.c:407
 #, fuzzy
-msgid "%l:%M %d %B"
+msgid "%l:%M%P %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-calendar.c:438
+#: my-evolution/e-summary-calendar.c:425
 #, fuzzy
 msgid "No description"
 msgstr "Descripci�:"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 #, fuzzy
 msgid "Mail summary"
 msgstr "Sense resum"
 
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1102
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
 #, fuzzy
 msgid "Local Folders"
 msgstr "Carpetes virtuals"
 
-#. translators: Put a list of codes for locations you want to see in
-#. My Evolution by default here. You can find the list of all
-#. stations and their codes in Evolution sources.
-#. (evolution/my-evolution/Locations)
-#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:591
-msgid "KBOS"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:584
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Afegeix un servidor de not�cies"
 
-#: my-evolution/e-summary-preferences.c:848
+#: my-evolution/e-summary-preferences.c:621
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "Error en carregar el fitxer: %s"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 #, fuzzy
 msgid "News Feed"
 msgstr "Servidors de not�cies"
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 #, fuzzy
 msgid "Add"
 msgstr "Afegeix"
 
-#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Mostra"
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 #, fuzzy
 msgid "No tasks"
 msgstr "Mostra les _adjuncions"
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 #, fuzzy
 msgid "(No Description)"
 msgstr "(Sense descripci�)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:480
 #, fuzzy
 msgid "Weather"
 msgstr "Altres"
 
-#: my-evolution/e-summary.c:188
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:584
+msgid "KBOS"
+msgstr ""
+
+#: my-evolution/e-summary.c:198
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 #, fuzzy
 msgid "Please wait..."
 msgstr "acaba amb"
 
-#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
 msgstr "R_esum"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: my-evolution/main.c:68
-#, fuzzy
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
-
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " F"
 msgstr ""
 
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " C"
 msgstr ""
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 #, fuzzy
 msgid "knots"
 msgstr "Lletres"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr ""
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 #, fuzzy
 msgid "inHg"
 msgstr "S'est� movent"
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "mmHg"
 msgstr ""
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 #, fuzzy
 msgid "miles"
 msgstr "_Filtres de correu ..."
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 #, fuzzy
 msgid "kilometers"
 msgstr "_Filtres de correu ..."
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 #, fuzzy
 msgid "Clear sky"
 msgstr "Agenda"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr ""
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr ""
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr ""
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
 msgid "Invalid"
 msgstr ""
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 #, fuzzy
 msgid "Variable"
 msgstr "Inhabilitat"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 #, fuzzy
 msgid "North"
 msgstr "quart"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 #, fuzzy
 msgid "Northeast"
 msgstr "No_tes:"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 #, fuzzy
 msgid "East"
 msgstr "�ltim"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 #, fuzzy
 msgid "Southeast"
 msgstr "Fonts"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 #, fuzzy
 msgid "South"
 msgstr "quart"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 #, fuzzy
 msgid "Southwest"
 msgstr "Baixa"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 #, fuzzy
 msgid "West"
 msgstr "Comprova"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 #, fuzzy
 msgid "Northwest"
 msgstr "Baixa"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr ""
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 #, fuzzy
 msgid "Showers"
 msgstr "Mostra"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 #, fuzzy
 msgid "Rain"
 msgstr "R�dio"
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 #, fuzzy
 msgid "Heavy rain"
 msgstr "Abast de dies"
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr ""
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 #, fuzzy
 msgid "Snow"
 msgstr "ara"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr ""
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 #, fuzzy
 msgid "Snow grain showers"
 msgstr "Mostra en aquest ordre"
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 #, fuzzy
 msgid "Light hail"
 msgstr "vuit�"
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 #, fuzzy
 msgid "Shallow hail"
 msgstr "Mostra 1 dia"
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 #, fuzzy
 msgid "Partial hail"
 msgstr "Adre�a electr�nica principal"
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 #, fuzzy
 msgid "Freezing hail"
 msgstr "Sendmail"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 #, fuzzy
 msgid "Shallow small hail"
 msgstr "Mostra"
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 #, fuzzy
 msgid "Showers of small hail"
 msgstr "Mostra"
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 #, fuzzy
 msgid "Unknown thunderstorm"
 msgstr "Error desconegut"
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 #, fuzzy
 msgid "Freezing precipitation"
 msgstr "Hora d'_inici de la reuni�:"
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 #, fuzzy
 msgid "Mist"
 msgstr "�s"
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 #, fuzzy
 msgid "Partial mist"
 msgstr "Vertical"
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 #, fuzzy
 msgid "Drifting mist"
 msgstr "Llista de correu %s"
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 #, fuzzy
 msgid "Fog with wind"
 msgstr "Suprimeix aquesta cita"
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 #, fuzzy
 msgid "Smoke"
 msgstr "Puntuaci�"
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 #, fuzzy
 msgid "Shallow smoke"
 msgstr "Mostra les _adjuncions"
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 #, fuzzy
 msgid "Smoke with wind"
 msgstr "Suprimeix aquesta cita"
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 #, fuzzy
 msgid "Showers of volcanic ash"
 msgstr "Mostra"
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 #, fuzzy
 msgid "Sand"
 msgstr "_Envia"
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 #, fuzzy
 msgid "Haze"
 msgstr "Cap�alera"
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 #, fuzzy
 msgid "Light haze"
 msgstr "vuit�"
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 #, fuzzy
 msgid "Spray"
 msgstr "dies"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 #, fuzzy
 msgid "Light spray"
 msgstr "vuit�"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 #, fuzzy
 msgid "Moderate spray"
 msgstr "Esborra la visualitzaci� del missatge"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 #, fuzzy
 msgid "Heavy spray"
 msgstr "Abast de dies"
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 #, fuzzy
 msgid "Shallow spray"
 msgstr "Mostra 1 dia"
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 #, fuzzy
 msgid "Partial spray"
 msgstr "Vertical"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 #, fuzzy
 msgid "Drifting spray"
 msgstr "Llista de correu %s"
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 #, fuzzy
 msgid "Freezing spray"
 msgstr "Sendmail"
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 #, fuzzy
 msgid "Dust"
 msgstr "agost"
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
+#: my-evolution/metar.c:443 my-evolution/metar.c:452
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:443
+#: my-evolution/metar.c:444
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -26651,38 +26951,36 @@ msgstr "Seleccioneu una carpeta"
 msgid "_Weather"
 msgstr "Altres"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for Evolution folder settings."
-msgstr ""
-"Utilitat de configuraci� per al conducte de les coses per fer de "
-"l'Evolution.\n"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 #, fuzzy
-msgid "Folder Settings"
-msgstr "_Par�metres"
+msgid "Evolution Shell"
+msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
 #, fuzzy
-msgid "The Evolution shell."
-msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
+msgid "Evolution folder settings configuration control"
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "_Par�metres"
 
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 #, fuzzy
 msgid "Show Details"
 msgstr "Detalls"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 #, fuzzy
 msgid "Cancel Operation"
 msgstr "Cancel�lat"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -26691,58 +26989,40 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, fuzzy, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "Obre a %s..."
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 #, fuzzy
 msgid "Add a Folder"
 msgstr "Afegeix una regla de la VFolder"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Drafts"
 msgstr "Data de venciment"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
-#: shell/e-shortcuts.c:1055
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr ""
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr ""
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 #, fuzzy
 msgid "Sent"
 msgstr "Vist"
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "Instal�laci� de l'Evolution"
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Aquesta nova versi� de l'Evolution necessita instal�lar fitxers addicionals\n"
-"al directori personal on teniu l'Evolution"
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Si us plau, feu clic a \"D'acord\" per instal�lar els fitxers, o a "
-"\"Cancel�la\" per sortir."
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -26753,40 +27033,14 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "S'ha produ�t un error en llegir el fitxer."
 
-#: shell/e-setup.c:282
-#, fuzzy, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"No s'ha pogut crear el directori %s:\n"
-"%s"
-
-#: shell/e-setup.c:300
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:306
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:329
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -26797,16 +27051,7 @@ msgstr ""
 "Si us plau, moveu-lo per permetre la instal�laci�\n"
 "dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-setup.c:343
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -26821,27 +27066,27 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
 msgstr "Completat"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "Carpetes virtuals"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
 msgstr "Carpetes virtuals"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "Carpetes virtuals"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 #, fuzzy
 msgid "Autocompletion Folders"
 msgstr "Completat"
@@ -26851,50 +27096,50 @@ msgstr "Completat"
 msgid "Cannot copy folder: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, fuzzy, c-format
 msgid "Cannot move folder: %s"
 msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "No es pot bifurcar %s: %s"
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "No es poden copiar els fitxers a\n"
 "`%s'."
 
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:204
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:321
+#: shell/e-shell-folder-commands.c:319
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 #, fuzzy
 msgid "Copy folder"
 msgstr "Copia a la carpeta"
 
-#: shell/e-shell-folder-commands.c:365
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 #, fuzzy
 msgid "Move folder"
 msgstr "Mou a la carpeta"
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -26903,17 +27148,17 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
-#, fuzzy, c-format
-msgid "Delete \"%s\""
-msgstr "Crea \"%s\""
-
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Suprimeix la tasca"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:412
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "Crea \"%s\""
+
+#: shell/e-shell-folder-commands.c:485
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -26922,27 +27167,27 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 #, fuzzy
 msgid "Rename folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:165
+#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-creation-dialog.c:170
 #, fuzzy, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "El nom de carpeta indicat no �s v�lid."
 
-#: shell/e-shell-folder-commands.c:586
+#: shell/e-shell-folder-commands.c:583
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:586
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -26951,7 +27196,7 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:122
+#: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -26960,24 +27205,20 @@ msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "_Crea una carpeta nova..."
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "Nou..."
-
-#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sense t�tol)"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -26986,296 +27227,296 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:552
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:504
+#: shell/e-shell-importer.c:509
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "No hi ha nou correu a %s."
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 #, fuzzy
 msgid "Importing"
 msgstr "S'est� movent"
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 #, fuzzy
 msgid "Automatic"
 msgstr "Tria autom�tica"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 #, fuzzy
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 #, fuzzy
 msgid "Select a file"
 msgstr "Fitxer de signatura:"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 #, fuzzy
 msgid "File type:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
 #, fuzzy
 msgid "Import a single file"
 msgstr "S'est� movent"
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 #, fuzzy
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, fuzzy, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
 "%s"
 msgstr "Sincronitza \"%s\""
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 #, fuzzy
 msgid "Syncing Folder"
 msgstr "S'est� sincronitzant \"%s\""
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:317
+#: shell/e-shell-offline-sync.c:311
 #, fuzzy, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Sincronitza \"%s\""
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:345
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Instal�laci� de l'Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:357
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+#, fuzzy
+msgid "Please select a user."
+msgstr "Suprimeix la tasca"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 #, fuzzy
 msgid "Opening Folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Obre a %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:455
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:513
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:159
-#, fuzzy, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"No es pot inicialitzar el hash d'emmagatzematge de correu de l'Evolution."
-
-#: shell/e-shell-startup-wizard.c:169
-#, fuzzy
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr ""
-"No es pot inicialitzar el hash d'emmagatzematge de correu de l'Evolution."
-
-#: shell/e-shell-user-creatable-items-handler.c:579
-#: shell/e-shell-user-creatable-items-handler.c:633
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:636
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr "Nou"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 #, fuzzy
 msgid "No folder name specified."
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr ""
 
-#: shell/e-shell-utils.c:127
+#: shell/e-shell-utils.c:129
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "No s'ha pogut crear el directori %s: %s"
+
+#: shell/e-shell-utils.c:135
 #, fuzzy
-msgid "Folder name cannot contain slashes."
+msgid "Folder name cannot contain the character \"#\"."
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:94
+#: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Error en desar el fitxer: %s"
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "No s'ha trobat el Bug Buddy en el vostre $PATH."
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "_Quant a l'Evolution..."
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "V�s a la carpeta..."
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:618
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 #, fuzzy
 msgid "_Work Online"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 #, fuzzy
 msgid "_Work Offline"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 #, fuzzy
 msgid "Work Offline"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-view.c:1861
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1863
+#: shell/e-shell-view.c:2047
 #, fuzzy
 msgid "(None)"
 msgstr "(Sense nom)"
 
-#: shell/e-shell-view.c:1910
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1917
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1923
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -27288,12 +27529,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -27301,166 +27542,160 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configuraci� del correu"
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Error gen�ric"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Nom del grup:"
 
-#: shell/e-shortcuts-view.c:173
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
+#: shell/e-shortcuts-view.c:179
+#, fuzzy, c-format
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
 msgstr ""
 "Esteu segur que voleu eliminar el grup\n"
 "`%s' de la barra de dreceres?"
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "No l'eliminis"
-
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "Icones _petites"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra les dreceres com a icones petites"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "Icones _grans"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra les dreceres com a icones grans"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_Nou grup..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create _Default Shortcuts"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 #, fuzzy
 msgid "Create Default Shortcuts"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "Obre'l en una nova finestra"
 
-#: shell/e-shortcuts-view.c:410
+#: shell/e-shortcuts-view.c:417
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Envia aquest missatge"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 #, fuzzy
 msgid "_Rename"
 msgstr "Nom de la regla: "
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 #, fuzzy
 msgid "Re_move"
 msgstr "Elimina"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Error en desar les dreceres."
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Mostra la barra de _dreceres"
@@ -27469,75 +27704,75 @@ msgstr "Mostra la barra de _dreceres"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Cap error"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Ja existeix una carpeta amb el mateix nom"
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "El tipus de carpeta especificat no �s v�lid"
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "Error d'E/S"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Funci� no implementada en aquest emmagatzemament"
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Operaci� no suportada"
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "No es pot bifurcar %s: %s"
 
-#: shell/e-storage.c:599
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-task-widget.c:191
+#: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:196
+#: shell/e-task-widget.c:216
 #, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% comp_let:"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<feu clic aqu� per seleccionar una carpeta>"
 
@@ -27567,97 +27802,92 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 #, fuzzy
 msgid "CORBA error"
 msgstr "Error d'E/S"
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
 #, fuzzy
 msgid "Invalid argument"
 msgstr "adjunci�"
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1190
 #, fuzzy
 msgid "No owner"
 msgstr "Cap"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 #, fuzzy
 msgid "Not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Detecta els tipus suportats..."
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Consulta cancel�lada per l'usuari."
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 #, fuzzy
 msgid "Internal error"
 msgstr "Error d'E/S"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 #, fuzzy
 msgid "Exists"
 msgstr "S_urt"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Agenda"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 #, fuzzy
 msgid "Has subfolders"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 #, fuzzy
 msgid "No space left"
 msgstr "S'ha rebut el missatge"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test type"
 msgstr "Nom del fitxer:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/evolution-test-component.c:703
 #, fuzzy
-msgid "Active connections"
-msgstr "El cos cont�"
+msgid "Evolution Test Component"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-#, fuzzy
-msgid "Host"
-msgstr "Hores"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr ""
 
@@ -27681,17 +27911,17 @@ msgstr "_Correu"
 msgid "_Tasks:"
 msgstr "Tasques"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder name:"
 msgstr "Nom del fitxer:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder type:"
 msgstr "Carpetes"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 #, fuzzy
 msgid "Specify where to create the folder:"
 msgstr "No hi ha espai suficient per crear la carpeta"
@@ -27716,40 +27946,40 @@ msgstr "Nom del fitxer:"
 msgid "_User:"
 msgstr "Nom d'usuari:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Evolution Setup Assistant"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Importing Files"
 msgstr "S'est� movent"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 #, fuzzy
 msgid "Timezone "
 msgstr "Divisions de temps:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 
 #: shell/importer/import.glade.h:1
@@ -27787,45 +28017,46 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 #, fuzzy
 msgid "Importers"
 msgstr "S'est� movent"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 #, fuzzy
 msgid "Don't import"
 msgstr "No l'eliminis"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 #, fuzzy
 msgid "Don't ask me again"
 msgstr "Envia aquest missatge"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:102
+#: shell/main.c:118
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "_Par�metres"
 
-#: shell/main.c:227
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:266
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -27856,7 +28087,7 @@ msgstr ""
 "Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
 "ansiosament les vostres contribucions!\n"
 
-#: shell/main.c:250
+#: shell/main.c:290
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -27865,77 +28096,111 @@ msgstr ""
 "Gr�cies\n"
 "L'equip de l'Evolution\n"
 
-#: shell/main.c:259
+#: shell/main.c:298
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Envia aquest missatge"
 
-#: shell/main.c:394
+#: shell/main.c:387
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/main.c:485
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:487
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Data d'_inici:"
 
-#: shell/main.c:489
+#: shell/main.c:532
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Data d'_inici:"
 
-#: shell/main.c:491
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr ""
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:493
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:542
-msgid "Cannot initialize the Bonobo component system."
-msgstr "No es pot inicialitzar el sistema de components del Bonobo."
-
-#: tools/evolution-addressbook-abuse.c:80
-#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-abuse.c:81
 #: tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
 msgstr "Error en carregar el fitxer: %s"
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "FIXME: Insereix el fitxer..."
 
-#: tools/evolution-addressbook-export.c:46
-#, fuzzy
-msgid "Output File"
-msgstr "Obre un fitxer"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 #, fuzzy
 msgid "No filename provided."
 msgstr "(Cap carpeta mostrada)"
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Afegeix una adjunci�..."
+
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:327
+#, fuzzy
+msgid "Description of the attachment."
+msgstr "Descripci�:"
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:329
+#, fuzzy
+msgid "Default subject for the message."
+msgstr "Suprimeix aquest missatge"
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "No es pot executar %s: %s\n"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:3
 #, fuzzy
 msgid "Copy Contact(s) to Another Folder..."
@@ -28042,7 +28307,7 @@ msgstr "l'hora actual"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr "_Accions"
 
@@ -28181,7 +28446,7 @@ msgid "Print this item"
 msgstr "Imprimeix aquest element"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "Desa"
 
@@ -28210,7 +28475,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Fitxer"
 
@@ -28496,7 +28761,7 @@ msgstr "Llista de missatges en cadena"
 msgid "_Expunge"
 msgstr "_Esborra"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Carpeta"
 
@@ -28795,7 +29060,7 @@ msgstr "Respon"
 
 #: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Post a reply to a message message in a Public folder"
+msgid "Post a reply to a message in a Public folder"
 msgstr "Comprova si hi ha nou correu"
 
 #: ui/evolution-mail-message.xml.h:64
@@ -28981,7 +29246,7 @@ msgstr "Cap"
 msgid "_Resend..."
 msgstr "_Tanca..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Eines"
 
@@ -28998,13 +29263,13 @@ msgstr "Suprimeix aquesta cita"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 #, fuzzy
 msgid "_Close"
 msgstr "Tanca"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "_Visualitza"
 
@@ -29012,6 +29277,10 @@ msgstr "_Visualitza"
 msgid "Attach"
 msgstr "Adjunta"
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Adjunta un fitxer"
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 #, fuzzy
 msgid "Close the current file"
@@ -29209,7 +29478,7 @@ msgstr "HTML"
 msgid "Save the current file and close the window"
 msgstr "Desa el contacte i tanca el quadre de di�leg"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr "_Ajuda"
 
@@ -29415,145 +29684,135 @@ msgstr "_Par�metres"
 
 #: ui/evolution.xml.h:27
 #, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "_Par�metres"
-
-#: ui/evolution.xml.h:28
-#, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "_Crea una carpeta nova..."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send / Receive"
 msgstr "Sendmail"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Envia el correu de la cua i recupera'n el nou"
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "Configuraci� del correu"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configuraci� del correu"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Mostra informaci� referent a l'Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Submit Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Envia un informe d'error mitjan�ant el Bug Buddy"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "Toggle"
 msgstr "M�bil"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commuta la visualitzaci� o no de la barra de dreceres"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "Toggle whether we are working offline."
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Visualitza la carpeta seleccionada"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Copy..."
 msgstr "Copia"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "_V�s a la carpeta..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Import..."
 msgstr "S'est� movent"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Move..."
 msgstr "Mou"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nova VFolder"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "_Crea una carpeta nova..."
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Tanca..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 #, fuzzy
 msgid "_Send / Receive"
 msgstr "Sendmail"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "Mostra la barra de _dreceres"
@@ -29647,9 +29906,8 @@ msgstr "categories"
 msgid "_Tasks"
 msgstr "Tasca"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr ""
 
@@ -29675,23 +29933,23 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 #, fuzzy
 msgid "_Current View"
 msgstr "l'hora actual"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:357
+#: widgets/menus/gal-view-menus.c:350
 #, fuzzy
 msgid "Custom View"
 msgstr "Cerca personalitzada"
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 #, fuzzy
 msgid "Save Custom View"
 msgstr "Cerca personalitzada"
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr ""
 
@@ -29702,19 +29960,19 @@ msgid "MTWTFSS"
 msgstr "DDDDDDD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1070
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "Ara"
 
-#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr "Avui"
 
-#: widgets/misc/e-cell-date-edit.c:797
+#: widgets/misc/e-cell-date-edit.c:805
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -29726,85 +29984,85 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor de percentatge ha d'estar entre 0 i 100, ambd�s inclosos"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 #, fuzzy
 msgid "Greek"
 msgstr "setmana"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 #, fuzzy
 msgid "Turkish"
 msgstr "Tasca"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 #, fuzzy
 msgid "Traditional"
 msgstr "Opcions"
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 #, fuzzy
 msgid "Visual"
 msgstr "Alarmes visuals"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, fuzzy, c-format
 msgid "Unknown character set: %s"
 msgstr "Error desconegut: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 #, fuzzy
 msgid "Other..."
 msgstr "Altres"
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr ""
 
@@ -29812,12 +30070,13 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 #, fuzzy
 msgid "Search Editor"
 msgstr "Contacta l'editor"
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 #, fuzzy
 msgid "Save Search"
 msgstr "Cerca"
@@ -29837,77 +30096,534 @@ msgstr "Cerca"
 msgid "_Advanced..."
 msgstr "Afegeix..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 #, fuzzy
 msgid "Information"
 msgstr "Cap informaci�"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 #, fuzzy
 msgid "Error"
 msgstr "Cap error"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 #, fuzzy
 msgid "Question"
 msgstr "Descripci�:"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 #, fuzzy
 msgid "Message"
 msgstr "_Missatge"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
+#: widgets/misc/e-search-bar.c:531
 #, fuzzy
-msgid "Don't show this message again."
-msgstr "Envia aquest missatge"
+msgid "_Search"
+msgstr "Cerca"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 #, fuzzy
 msgid "_Find Now"
 msgstr "finestra2"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "Agenda"
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:833
+#, fuzzy
+msgid "Item ID"
+msgstr "_Tasca (FIXME)"
+
+#: widgets/misc/e-search-bar.c:840
+msgid "Subitem ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:847
+#, fuzzy
+msgid "Text"
+msgstr "Comprova"
+
+#: widgets/misc/e-search-bar.c:925
 #, fuzzy
 msgid "Clear"
 msgstr "Agenda"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 #, fuzzy
 msgid "Find Now"
 msgstr "finestra2"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
 #, fuzzy
-msgid "The Personal Addressbook Server"
-msgstr "Afegeix una font"
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr ""
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Conducte de l'agenda de l'Evolution"
 
-#: wombat/wombat.c:199
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
 #, fuzzy
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+msgid "Evolution Addressbook local file backend"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
-#: wombat/wombat.c:211
 #, fuzzy
-msgid "init_corba(): could not initialize GNOME"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: wombat/wombat.c:224
 #, fuzzy
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de la llibreta d'adreces de "
+#~ "l'Evolution\n"
+
+#, fuzzy
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Factory for the configuration controls for the Evolution Addressbook."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "Feu clic aqu� per a la llibreta d'adreces"
+
+#, fuzzy
+#~ msgid "1234"
+#~ msgstr "123"
+
+#, fuzzy
+#~ msgid "<- _Remove"
+#~ msgstr "<< Elimina"
+
+#, fuzzy
+#~ msgid "<< Fewer Options"
+#~ msgstr "Opcions"
+
+#, fuzzy
+#~ msgid "DN Customization"
+#~ msgstr "Cerca personalitzada"
+
+#, fuzzy
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "LDAP Attribute"
+#~ msgstr "Autenticaci�:"
+
+#, fuzzy
+#~ msgid "Mappings"
+#~ msgstr "Marges"
+
+#, fuzzy
+#~ msgid "Objectclasses"
+#~ msgstr "_Objecte"
+
+#, fuzzy
+#~ msgid "R_estore Defaults"
+#~ msgstr "Valors predeterminats"
+
+#, fuzzy
+#~ msgid "Re_store Defaults"
+#~ msgstr "Valors predeterminats"
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "Selecciona'ls _tots"
+
+#, fuzzy
+#~ msgid "_Add ->"
+#~ msgstr "Afegeix >>"
+
+#, fuzzy
+#~ msgid "_Add Mapping"
+#~ msgstr "Afegeix una acci�"
+
+#, fuzzy
+#~ msgid "_Add to DN"
+#~ msgstr "Afegeix una acci�"
+
+#, fuzzy
+#~ msgid "_Always"
+#~ msgstr "Alarmes"
+
+#, fuzzy
+#~ msgid "_Delete Mapping"
+#~ msgstr "_Suprimeix"
+
+#, fuzzy
+#~ msgid "_Edit Mapping"
+#~ msgstr "Edita una cita"
+
+#, fuzzy
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "_More Options >>"
+#~ msgstr "_Opcions"
+
+#, fuzzy
+#~ msgid "_Restore Defaults"
+#~ msgstr "Valors predeterminats"
+
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "cont�"
+
+#, fuzzy
+#~ msgid "account-editor"
+#~ msgstr "Contacta l'editor"
+
+#, fuzzy
+#~ msgid "Edit Contact List"
+#~ msgstr "_Contactes..."
+
+#, fuzzy
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Contacte _nou"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontactes..."
+
+#~ msgid "Phone Types"
+#~ msgstr "Tipus de tel�fon"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "Voleu suprimir el contacte?"
+
+#, fuzzy
+#~ msgid "Display Cards?"
+#~ msgstr "_Visualitzaci�"
+
+#, fuzzy
+#~ msgid "Display Cards"
+#~ msgstr "_Visualitzaci�"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#, fuzzy
+#~ msgid "st"
+#~ msgstr "1"
+
+#, fuzzy
+#~ msgid "nd"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "rd"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "th"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#, fuzzy
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "No s'ha pogut crear el directori temporal: %s"
+
+#~ msgid "Print Calendar"
+#~ msgstr "Imprimeix l'agenda"
+
+#, fuzzy
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr ""
+#~ "No es pot recuperar el missatge: %s\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "No s'ha pogut connectar al servidor POP en %s."
+
+#, fuzzy
+#~ msgid "Warning!"
+#~ msgstr "S'est� movent"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#~ msgid "minute"
+#~ msgstr "minut"
+
+#~ msgid "hour"
+#~ msgstr "hora"
+
+#~ msgid "week"
+#~ msgstr "setmana"
+
+#~ msgid "year"
+#~ msgstr "any"
+
+#~ msgid "Add action"
+#~ msgstr "Afegeix una acci�"
+
+#~ msgid "Add criterion"
+#~ msgstr "Afegeix un criteri"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr ""
+#~ "No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "Reenvia el missatge"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#, fuzzy
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Imprimeix el missatge seleccionat"
+
+#, fuzzy
+#~ msgid "Add Signature"
+#~ msgstr "Fitxer de signatura:"
+
+#, fuzzy
+#~ msgid "Account %d"
+#~ msgstr "cont�"
+
+#, fuzzy
+#~ msgid "_Variable-width:"
+#~ msgstr "Inhabilitat"
+
+#, fuzzy
+#~ msgid "All folders"
+#~ msgstr "Carpetes"
+
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "abril"
+
+#, fuzzy
+#~ msgid "Display Options"
+#~ msgstr "Opcions de visualitzaci�"
+
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "Fitxer de signatura:"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de les coses per fer de "
+#~ "l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Marquette"
+#~ msgstr "Minut"
+
+#, fuzzy
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de les coses per fer de "
+#~ "l'Evolution.\n"
+
+#~ msgid "Evolution installation"
+#~ msgstr "Instal�laci� de l'Evolution"
+
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "Aquesta nova versi� de l'Evolution necessita instal�lar fitxers "
+#~ "addicionals\n"
+#~ "al directori personal on teniu l'Evolution"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "Si us plau, feu clic a \"D'acord\" per instal�lar els fitxers, o a "
+#~ "\"Cancel�la\" per sortir."
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut crear el directori %s:\n"
+#~ "%s"
+
+#~ msgid "New..."
+#~ msgstr "Nou..."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "No es pot inicialitzar el hash d'emmagatzematge de correu de l'Evolution."
+
+#, fuzzy
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr ""
+#~ "No es pot inicialitzar el hash d'emmagatzematge de correu de l'Evolution."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "No s'ha trobat el Bug Buddy en el vostre $PATH."
+
+#~ msgid "Don't remove"
+#~ msgstr "No l'eliminis"
+
+#, fuzzy
+#~ msgid "Active connections"
+#~ msgstr "El cos cont�"
+
+#, fuzzy
+#~ msgid "Host"
+#~ msgstr "Hores"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "No es pot inicialitzar el sistema de components del Bonobo."
+
+#, fuzzy
+#~ msgid "Output File"
+#~ msgstr "Obre un fitxer"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "_Par�metres"
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Configuraci� del correu"
+
+#, fuzzy
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Afegeix una font"
+
+#, fuzzy
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#, fuzzy
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#, fuzzy
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
 #~ msgid "_Configure..."
@@ -29964,10 +30680,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "%u octets"
 
 #, fuzzy
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Conducte de les coses per fer de l'Evolution"
-
-#, fuzzy
 #~ msgid "_Preferences..."
 #~ msgstr "Prefer�ncies"
 
@@ -30083,10 +30795,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "o s'obri la vfolder."
 
 #, fuzzy
-#~ msgid "Evolution News Editor"
-#~ msgstr "Conducte de les coses per fer de l'Evolution"
-
-#, fuzzy
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr ""
 #~ "Esteu segur que voleu\n"
@@ -30106,9 +30814,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "News Servers"
 #~ msgstr "Edita el servidor de not�cies"
 
-#~ msgid "Source"
-#~ msgstr "Font"
-
 #, fuzzy
 #~ msgid "Source Information"
 #~ msgstr "Cap informaci�"
@@ -30182,11 +30887,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr ""
-#~ "No es pot inicialitzar el component de resum del correu de l'Evolution."
-
-#, fuzzy
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr ""
 #~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
@@ -30278,10 +30978,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Edita"
 
 #, fuzzy
-#~ msgid " New "
-#~ msgstr "Nou"
-
-#, fuzzy
 #~ msgid "Advanced Options"
 #~ msgstr "Cancel�lat"
 
@@ -30418,10 +31114,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Visualitza tots els contactes"
 
 #, fuzzy
-#~ msgid "Edit Addressbook"
-#~ msgstr "Desa a la llibreta d'adreces"
-
-#, fuzzy
 #~ msgid "Add Addressbook"
 #~ msgstr "Desa a la llibreta d'adreces"
 
@@ -30652,10 +31344,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "(Sense nom)"
 
 #, fuzzy
-#~ msgid "New List"
-#~ msgstr "Nou"
-
-#, fuzzy
 #~ msgid "Create a New All Day _Event"
 #~ msgstr "Crea una nova agenda"
 
@@ -31294,9 +31982,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Find..."
 #~ msgstr "Cerca..."
 
-#~ msgid "Save calendar"
-#~ msgstr "Desa l'agenda"
-
 #~ msgid "Alarms timeout after"
 #~ msgstr "Les alarmes es desactiven despr�s de"
 
@@ -31383,10 +32068,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "%s is not a selectable folder"
 #~ msgstr "Visualitza la carpeta seleccionada"
 
-#, fuzzy
-#~ msgid "Send as:"
-#~ msgstr "Envia \"%s\""
-
 #~ msgid "That file exists but is not readable."
 #~ msgstr "Aquest fitxer existeix per� no es pot llegir."
 
@@ -31506,9 +32187,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Print the selected message"
 #~ msgstr "Imprimeix el missatge seleccionat"
 
-#~ msgid "Delete this message"
-#~ msgstr "Suprimeix aquest missatge"
-
 #~ msgid "Evolution files successfully installed."
 #~ msgstr "Els fitxers de l'Evolution s'han instal�lat amb �xit."
 
@@ -31600,10 +32278,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "_Quant a l'Evolution..."
 
 #, fuzzy
-#~ msgid "_Item (FIXME)"
-#~ msgstr "_Tasca (FIXME)"
-
-#, fuzzy
 #~ msgid "_Journal Entry (FIXME)"
 #~ msgstr "_Contacte (FIXME)"
 
@@ -31804,10 +32478,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Especifiqueu la cap�alera"
 
 #, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Configuraci� del correu"
-
-#, fuzzy
 #~ msgid "Keep mail on server"
 #~ msgstr "No suprimeixis els missatges del servidor"
 
@@ -31942,9 +32612,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "III\n"
 #~ "Esq.\n"
 
-#~ msgid "Evolution Calendar Conduit"
-#~ msgstr "Conducte de l'agenda de l'Evolution"
-
 #~ msgid "Evolution ToDo Conduit"
 #~ msgstr "Conducte de les coses per fer de l'Evolution"
 
@@ -32041,13 +32708,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Saving changes to %s"
 #~ msgstr "S'estan desant els canvis a %s"
 
-#~ msgid ""
-#~ "Cannot open location `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "No es pot obrir la ubicaci� `%s':\n"
-#~ "%s"
-
 #, fuzzy
 #~ msgid "Unsubscribe from folder \"%s\""
 #~ msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
@@ -32320,10 +32980,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "News Sources"
 #~ msgstr "Fonts de not�cies"
 
-#, fuzzy
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Configuraci� del _correu..."
-
 #~ msgid "_Print Contacts..."
 #~ msgstr "_Imprimeix els contactes..."
 
@@ -32653,9 +33309,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "de correu electr�nic i podreu comen�ar immediatament a enviar\n"
 #~ "i rebre correu. Feu clic a Seg�ent per continuar."
 
-#~ msgid "Could not execute %s: %s\n"
-#~ msgstr "No es pot executar %s: %s\n"
-
 #~ msgid " (XXX unread)"
 #~ msgstr " (XXX no llegits)"
 
diff --git a/po/cs.po b/po/cs.po
index 16898b5f15..81e05a7627 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2003-04-09 11:50+0200\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-04-09 19:39+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -961,7 +961,7 @@ msgid "LDAP Configuration Assistant"
 msgstr "Pomocník nastavení LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Nikdy"
 
@@ -991,7 +991,7 @@ msgstr "_Rozsah vyhledávání: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:35
-#: calendar/gui/calendar-model.c:1975 calendar/gui/e-day-view.c:1683
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
 #: calendar/gui/e-week-view.c:1233
 msgid "Searching"
 msgstr "Vyhledávání"
@@ -2884,7 +2884,7 @@ msgid "Protocol not supported"
 msgstr "Protokol není podporován"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1176
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
 #: camel/camel-service.c:737 camel/camel-service.c:779
@@ -3580,7 +3580,7 @@ msgid "High"
 msgstr "Vysoká"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/calendar-model.c:1704
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
@@ -3891,12 +3891,12 @@ msgstr "_Celodenní událost"
 msgid "Create a new all-day appointment"
 msgstr "Vytvořit novou celodenní událost"
 
-#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:956
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
 #: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Soukromé"
 
-#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:958
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
 #: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Důvěrné"
@@ -3921,7 +3921,7 @@ msgstr "V"
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1126
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
 #: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "Volný"
@@ -3932,26 +3932,26 @@ msgstr "Volný"
 msgid "Busy"
 msgstr "Obsazený"
 
-#: calendar/gui/calendar-model.c:742 calendar/gui/calendar-model.c:1170
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "Nezačato"
 
-#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1172
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "Probíhá"
 
-#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1174
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: calendar/gui/calendar-model.c:1028
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3962,32 +3962,32 @@ msgstr ""
 "\"45.436845,125.862501\""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1168 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
 #: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
 #: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
 #: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "žádný"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Opakovaný"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Přiřazeno"
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
 #: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
 #: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr "Ano"
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
 #: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Ne"
@@ -4167,7 +4167,7 @@ msgstr "skončení(-m) události"
 msgid "hour(s)"
 msgstr "hodin(-u,-y)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "minut(-u,-y)"
 
@@ -4347,7 +4347,7 @@ msgid "_Fri"
 msgstr "p_á"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "O_becné"
 
@@ -5086,46 +5086,57 @@ msgid "%s for an unknown trigger type"
 msgstr "%s pro neznámý typ spouštění"
 
 #: calendar/gui/e-calendar-table.c:415
+#, c-format
 msgid "0%"
 msgstr "0%"
 
 #: calendar/gui/e-calendar-table.c:416
+#, c-format
 msgid "10%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:417
+#, c-format
 msgid "20%"
 msgstr "20%"
 
 #: calendar/gui/e-calendar-table.c:418
+#, c-format
 msgid "30%"
 msgstr "30%"
 
 #: calendar/gui/e-calendar-table.c:419
+#, c-format
 msgid "40%"
 msgstr "40%"
 
 #: calendar/gui/e-calendar-table.c:420
+#, c-format
 msgid "50%"
 msgstr "50%"
 
 #: calendar/gui/e-calendar-table.c:421
+#, c-format
 msgid "60%"
 msgstr "60%"
 
 #: calendar/gui/e-calendar-table.c:422
+#, c-format
 msgid "70%"
 msgstr "70%"
 
 #: calendar/gui/e-calendar-table.c:423
+#, c-format
 msgid "80%"
 msgstr "80%"
 
 #: calendar/gui/e-calendar-table.c:424
+#, c-format
 msgid "90%"
 msgstr "90%"
 
 #: calendar/gui/e-calendar-table.c:425
+#, c-format
 msgid "100%"
 msgstr "100%"
 
@@ -11115,7 +11126,7 @@ msgstr "nazpět"
 msgid "months"
 msgstr "měsíce/-ů"
 
-#: filter/filter.glade.h:24 mail/mail-config.glade.h:181
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
 msgid "seconds"
 msgstr "vteřině(-ách)"
 
@@ -12004,7 +12015,7 @@ msgstr "Nevyplnili jste všechny požadované informace."
 msgid "Evolution Account Editor"
 msgstr "Editor účtů Evolution"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Počítač:"
 
@@ -12012,7 +12023,7 @@ msgstr "_Počítač:"
 msgid "User_name:"
 msgstr "_Jméno uživatele:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_Cesta:"
 
@@ -12301,13 +12312,13 @@ msgstr "Tisknout zprávu"
 msgid "Printing of message failed"
 msgstr "Tisk zprávy selhal"
 
-#: mail/mail-callbacks.c:3146
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Opravdu chcete otevřít všechny zprávy (%d) v samostatných oknech?"
 
 #: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
-#: mail/mail-config.c:1220
+#: mail/mail-config.c:1290
 msgid "Unnamed"
 msgstr "Beze jména"
 
@@ -12390,11 +12401,11 @@ msgstr ""
 "pro vytvoření poštovního účtu Evolution. Zadejte prosím níže název pro tento "
 "účet. Tento název bude použit pouze pro zobrazení."
 
-#: mail/mail-config.c:924
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Kontroluje se služba"
 
-#: mail/mail-config.c:1002 mail/mail-config.c:1006
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "Připojuji se k serveru..."
 
@@ -12639,24 +12650,25 @@ msgid "Message Display"
 msgstr "Zobrazení zprávy"
 
 #: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Zpráva obsahuje"
+
+#: mail/mail-config.glade.h:76
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Upozornění na novou poštu"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Poznámka: na heslo budete dotázáni, až když se pokusíte poprvé připojit"
 
-#: mail/mail-config.glade.h:80
-msgid "On Screen fonts"
-msgstr "Písma na obrazovce"
-
 #: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Nepovinné informace"
@@ -12894,103 +12906,109 @@ msgid "_Enable"
 msgstr "_Povolit"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr "P_evná šířka:"
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "_Styl přeposílání:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Celé jméno:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "_HTML dopis"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_Identita"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_Načíst obrázky, pokud je odesílatel v adresáři"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "Použít tento jako _výchozí účet"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Označit zprávu jako přečtenou po"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Jméno:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Nikdy nenačítat obrázky ze sítě"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "_Zahrát zvuk, když přijde nová pošta"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Upozornit, když posílám zprávu v HTML formátu kontaktům, které si to nepřejí"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozornit, když posílám zprávu s prázdným políčkem \"Předmět\""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Příjem pošty"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "Styl _odpovědí:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "_Obnovit výchozí hodnoty"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Ode_sílání pošty"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Zobrazovat animované obrázky"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Podpisy"
 
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Sand Point"
+
 #: mail/mail-config.glade.h:175
-msgid "_Use secure connection (SSL):"
-msgstr "Použít _bezpečné připojení (SSL):"
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Původní kontakt:"
 
 #: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "_Proměnlivá šířka:"
+msgid "_Use secure connection (SSL):"
+msgstr "Použít _bezpečné připojení (SSL):"
 
 #: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "_každých"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "barva"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "popis"
 
@@ -13746,40 +13764,40 @@ msgstr "Termín _dokončení:"
 msgid "_Flag:"
 msgstr "_Značka:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Prochází se složky pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Prochází se kořenové složky na \"%s\""
 
-#: mail/subscribe-dialog.c:331
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Přihlašuji si složku \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odhlašuji se ze složky \"%s\""
 
-#: mail/subscribe-dialog.c:1246 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Složka"
 
-#: mail/subscribe-dialog.c:1356
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Prochází se složky..."
 
-#: mail/subscribe-dialog.c:1470
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Nebyl vybrán žádný server"
 
-#: mail/subscribe-dialog.c:1545
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Vyberte prosím server."
 
@@ -26026,16 +26044,16 @@ msgstr "Příště se neptat"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution našel tyto soubory dat vhodné pro import:"
 
-#: shell/main.c:111 shell/main.c:561
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:117
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Evolution se právě zavírá ..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:266
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26071,7 +26089,7 @@ msgstr ""
 "Doufáme, že si užijete výsledků naší tvrdé práce a nedočkavě čekáme\n"
 "na vaše přispění!\n"
 
-#: shell/main.c:289
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26079,44 +26097,44 @@ msgstr ""
 "Děkujeme\n"
 "Team Ximian Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "Příště neupozorňovat"
 
-#: shell/main.c:386
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nelze inicializovat shell Ximian Evolution."
 
-#: shell/main.c:395
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nelze inicializovat shell Ximian Evolution: %s"
 
-#: shell/main.c:527
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Zakázat úvodní okno"
 
-#: shell/main.c:529
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Spustit v režimu odpojení"
 
-#: shell/main.c:531
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Spustit v režimu on-line"
 
-#: shell/main.c:534
+#: shell/main.c:535
 msgid "Forcibly shut down all evolution components"
 msgstr "Vynuceně ukončit všechny komponenty evolution"
 
-#: shell/main.c:537
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr "Poslat ladící výstup ze všech komponent do souboru."
 
-#: shell/main.c:540
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Přinutit k aktualizaci souborů s nastavením z Evolution 1.0.x"
 
-#: shell/main.c:565
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -27854,6 +27872,15 @@ msgstr "Obsluha místního souboru kalendáře Evolution"
 msgid "Evolution Addressbook local file backend"
 msgstr "Obsluha místního souboru adresáře Evolution"
 
+#~ msgid "On Screen fonts"
+#~ msgstr "Písma na obrazovce"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "P_evná šířka:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "_Proměnlivá šířka:"
+
 #~ msgid "(%d not shown)"
 #~ msgstr "<(%d nezobrazeno)"
 
diff --git a/po/da.po b/po/da.po
index 671f720f10..d47d2225e2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.1\n"
-"POT-Creation-Date: 2003-02-02 10:44+0100\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-02-02 12:41+0100\n"
 "Last-Translator: Søren Boll Overgaard <boll@debian.org>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -16,30 +16,38 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Fabrik til import af LDIF filer i Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolutions e-postredigering."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Importerer LDIF filer i Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Fabrik til import af VCard-filer i Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolutions e-postredigering."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importerer VCard-filer i Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolutions e-postredigering."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/backend/ebook/e-card.c:1297
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Gem som"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/backend/ebook/e-card.c:1311
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
@@ -47,13 +55,13 @@ msgid "Name"
 msgstr "Navn"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/backend/ebook/e-card.c:1338
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-post"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Primær"
 
@@ -63,8 +71,8 @@ msgstr "Pri"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1400
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
@@ -72,8 +80,8 @@ msgstr "Assistent"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Arbejde"
 
@@ -83,12 +91,12 @@ msgid "Bus"
 msgstr "Arb"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Ring tilbage"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Firma"
 
@@ -99,13 +107,13 @@ msgstr "Datamaskine"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Hjemme"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1358
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisation"
@@ -116,18 +124,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "Bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax på arbejde"
@@ -137,13 +145,13 @@ msgid "Bus Fax"
 msgstr "Arb-fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax hjemme"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Arbejde 2"
 
@@ -152,43 +160,43 @@ msgid "Bus 2"
 msgstr "Arb 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Hjemme 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Andre"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Anden fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Personsøger"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
@@ -199,15 +207,15 @@ msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1782
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-post 3"
@@ -231,7 +239,7 @@ msgid "Dep"
 msgstr "Afd"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1372
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Kontor"
@@ -241,7 +249,7 @@ msgid "Off"
 msgstr "Ktr"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1379
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Titel"
@@ -256,7 +264,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1393
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Leder"
@@ -270,7 +278,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1407
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Kaldenavn"
@@ -280,19 +288,19 @@ msgid "Nick"
 msgstr "Kaldt"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1414
+#: addressbook/backend/ebook/e-card.c:1418
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Ægtefælle"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1448
+#: addressbook/backend/ebook/e-card.c:1459
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Kommentar"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1434
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "Kalender URI"
 
@@ -310,260 +318,268 @@ msgid "FBUrl"
 msgstr "FBUrl"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
-#: addressbook/backend/ebook/e-card.c:1421
+msgid "Default server calendar"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "Kalender"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Br.dag"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Fødselsdato"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
-#: addressbook/backend/ebook/e-card.c:1462
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorier"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Efternavn"
 
-#: addressbook/backend/ebook/e-card-simple.c:334
+#: addressbook/backend/ebook/e-card-simple.c:335
 msgid "ECard"
 msgstr "ECard"
 
-#: addressbook/backend/ebook/e-card-simple.c:829
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:890
-#: addressbook/backend/ebook/e-destination.c:704
+#: addressbook/backend/ebook/e-card-simple.c:893
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Navnløs liste"
 
-#: addressbook/backend/ebook/e-card.c:1304
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:320
+#: addressbook/backend/ebook/e-card.c:1308
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Fulde navn"
 
-#: addressbook/backend/ebook/e-card.c:1317
+#: addressbook/backend/ebook/e-card.c:1321
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 msgid "Address"
 msgstr "Adresse"
 
-#: addressbook/backend/ebook/e-card.c:1324
+#: addressbook/backend/ebook/e-card.c:1328
 msgid "Address Label"
 msgstr "Adresseetikette"
 
-#: addressbook/backend/ebook/e-card.c:1331
+#: addressbook/backend/ebook/e-card.c:1335
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/backend/ebook/e-card.c:1345
+#: addressbook/backend/ebook/e-card.c:1349
 msgid "Birth date"
 msgstr "Fødselsdato"
 
-#: addressbook/backend/ebook/e-card.c:1351
+#: addressbook/backend/ebook/e-card.c:1355
 #: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
-#: addressbook/backend/ebook/e-card.c:1365
+#: addressbook/backend/ebook/e-card.c:1369
 msgid "Organizational Unit"
 msgstr "Organisationsenhed"
 
-#: addressbook/backend/ebook/e-card.c:1386
+#: addressbook/backend/ebook/e-card.c:1390
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolle"
 
-#: addressbook/backend/ebook/e-card.c:1427 mail/mail-format.c:933
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
 msgid "Mailer"
 msgstr "E-postprogram"
 
-#: addressbook/backend/ebook/e-card.c:1441
+#: addressbook/backend/ebook/e-card.c:1445
 msgid "Free/Busy URL"
 msgstr "Ledig/Optaget-URL"
 
-#: addressbook/backend/ebook/e-card.c:1455
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Kalender"
+
+#: addressbook/backend/ebook/e-card.c:1466
 msgid "Related Contacts"
 msgstr "Beslægtede kontakter"
 
-#: addressbook/backend/ebook/e-card.c:1469
+#: addressbook/backend/ebook/e-card.c:1480
 msgid "Category List"
 msgstr "Kategoriliste"
 
-#: addressbook/backend/ebook/e-card.c:1476
+#: addressbook/backend/ebook/e-card.c:1487
 msgid "Wants HTML"
 msgstr "Ønsker HTML"
 
-#: addressbook/backend/ebook/e-card.c:1483
+#: addressbook/backend/ebook/e-card.c:1494
 msgid "Wants HTML set"
 msgstr "Vil have HTML valgt"
 
-#: addressbook/backend/ebook/e-card.c:1490
+#: addressbook/backend/ebook/e-card.c:1501
 msgid "List"
 msgstr "Liste"
 
-#: addressbook/backend/ebook/e-card.c:1497
+#: addressbook/backend/ebook/e-card.c:1508
 msgid "List Show Addresses"
 msgstr "Vis visningsadresser"
 
-#: addressbook/backend/ebook/e-card.c:1504
+#: addressbook/backend/ebook/e-card.c:1515
 msgid "Arbitrary"
 msgstr "Tilfældig"
 
-#: addressbook/backend/ebook/e-card.c:1511
+#: addressbook/backend/ebook/e-card.c:1522
 msgid "ID"
 msgstr "ID"
 
-#: addressbook/backend/ebook/e-card.c:1518
+#: addressbook/backend/ebook/e-card.c:1529
 msgid "Last Use"
 msgstr "Seneste anvendelse"
 
-#: addressbook/backend/ebook/e-card.c:1529
+#: addressbook/backend/ebook/e-card.c:1540
 msgid "Use Score"
 msgstr "Anvend point"
 
-#: addressbook/backend/ebook/e-card.c:2870
-msgid "Multiple VCards"
-msgstr "Flere VCard"
-
-#: addressbook/backend/ebook/e-card.c:2878
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard for %s"
-
 #: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:31
+#: addressbook/backend/ebook/test-client.c:33
 #: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:355
-#: addressbook/backend/pas/pas-backend-ldap.c:3038
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Søger..."
 
-#: addressbook/backend/pas/pas-backend-file.c:357
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Indlæser..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:597
+#: addressbook/backend/pas/pas-backend-ldap.c:598
 msgid "Using Distinguished Name (DN)"
 msgstr "Bruger distinguished name (DN)"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:601
+#: addressbook/backend/pas/pas-backend-ldap.c:602
 msgid "Using Email Address"
 msgstr "Bruger e-postadresse"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:747
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr "Gentilslutter LDAP-serveren..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1290
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Tilføjer kort på LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1396
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Fjerner kort fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1632
-#: addressbook/backend/pas/pas-backend-ldap.c:1635
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "Ændrer kort fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2949
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Modtager søgeresultater fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:3058
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr "Fejl ved søgning"
 
-#: addressbook/conduit/address-conduit.c:292
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Standardsynkroniseringsadresse:"
 
-#: addressbook/conduit/address-conduit.c:535
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Markøren kunne ikke indlæses\n"
 
-#: addressbook/conduit/address-conduit.c:548
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook ikke indlæst\n"
 
-#: addressbook/conduit/address-conduit.c:1356
-#: calendar/conduits/calendar/calendar-conduit.c:1267
-#: calendar/conduits/todo/todo-conduit.c:877
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat-server"
 
-#: addressbook/conduit/address-conduit.c:1357
-#: calendar/conduits/calendar/calendar-conduit.c:1268
-#: calendar/conduits/todo/todo-conduit.c:878
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
-#: addressbook/conduit/address-conduit.c:1387
-#: addressbook/conduit/address-conduit.c:1390
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke læse pilotens adresseapplikationsblok"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "En Bonobo-kontrol for visning af en adresse."
+msgid "Configure access to LDAP directory servers here"
+msgstr "Konfigurer adgang til LDAP-katalogservere her"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "En Bonobo-kontrol for visning af en adresse."
+msgid "Directory Servers"
+msgstr "Katalogservere"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Eksempel på Bonobo-kontrol som viser en adressebog."
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Minikortvisning i Evolution adressebog"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Konfigurationsstyrning for Evolution adressbogslagrene."
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolution adressebog-komponent"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Konfigurer adgang til LDAP-katalogservere her"
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Minikortvisning i Evolution adressebog"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Kontrol som viser et minikort i Evolutions adressebog."
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Minikortvisning i Evolution adressebog"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "Katalogservere"
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Minikortvisning i Evolution adressebog"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Minikortvisning i Evolution adressebog"
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolutions testkomponent"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Evolution komponent til håndtering af kontakter."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Factory for the controls exported by the Evolution Addressbook"
-msgstr "Fabrik for kontrollerne som exporteres af Evolutions adressbog"
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Minikortvisning i Evolution adressebog"
 
 #: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:609
+#: addressbook/gui/component/addressbook-component.c:605
 #: calendar/gui/dialogs/comp-editor-util.c:309
 #: calendar/gui/dialogs/comp-editor-util.c:365
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1086
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -587,27 +603,27 @@ msgstr "Offentlige kontakter"
 msgid "Public folder containing contact information"
 msgstr "Offentlig folder som indeholder kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:569
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr "Opret en ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: addressbook/gui/component/addressbook-component.c:573
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr "Opret en ny kontaktliste"
 
@@ -627,27 +643,27 @@ msgstr "Kunne ikke gennemføre forespørgsel på rod-DSE"
 msgid "The server responded with no supported search bases"
 msgstr "Serveren svarede at ingen søgebaser understøttes"
 
-#: addressbook/gui/component/addressbook-config.c:1191
+#: addressbook/gui/component/addressbook-config.c:1193
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
 
-#: addressbook/gui/component/addressbook-config.c:1213
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr "Fejl ved hentning af schemainformation"
 
-#: addressbook/gui/component/addressbook-config.c:1221
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr "Serveren svarede ikke med gyldig schemainformation"
 
-#: addressbook/gui/component/addressbook-config.c:1647
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Kontonavn"
 
-#: addressbook/gui/component/addressbook-config.c:1649
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Servernavn"
 
-#: addressbook/gui/component/addressbook-config.c:1686
+#: addressbook/gui/component/addressbook-config.c:1676
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "LDAP understøttes ikke i denne udgave af Evolution"
 
@@ -655,7 +671,7 @@ msgstr "LDAP understøttes ikke i denne udgave af Evolution"
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/component/addressbook.c:514
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -663,7 +679,7 @@ msgstr ""
 "Kunne ikke åbne denne adressebog. Kontrollér venligst at stien\n"
 "eksisterer, og at du har rettigheder til at tilgå den."
 
-#: addressbook/gui/component/addressbook.c:524
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -673,7 +689,7 @@ msgstr ""
 "at du har angivet en forkert URI eller at LDAP-serveren ikke\n"
 "kan nåes."
 
-#: addressbook/gui/component/addressbook.c:529
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -685,7 +701,7 @@ msgstr ""
 "må du oversætte programmet fra kildekoden i CVS efter at\n"
 "have hentet OpenLDAP fra adressen nedenfor.\n"
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:537
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -695,49 +711,48 @@ msgstr ""
 "at du har angivet en fejlagtig URI eller at LDAP-serveren ikke\n"
 "kunne nåes."
 
-#: addressbook/gui/component/addressbook.c:559
+#: addressbook/gui/component/addressbook.c:557
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åbne adressebogen"
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr "Tilslutter LDAP-serveren anonymt"
 
-#: addressbook/gui/component/addressbook.c:662
+#: addressbook/gui/component/addressbook.c:667
 msgid "Failed to authenticate.\n"
 msgstr "Mislykkedes med godkendelse.\n"
 
-#: addressbook/gui/component/addressbook.c:670
-#: addressbook/gui/component/addressbook.c:673
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sAngiv adgangskode for %s (bruger %s)"
 
-#: addressbook/gui/component/addressbook.c:821
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr "Navn begynder med"
 
-#: addressbook/gui/component/addressbook.c:822
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr "E-postadresse begynder med"
 
-#: addressbook/gui/component/addressbook.c:823
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:824
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Et felt indeholder"
 
-#: addressbook/gui/component/addressbook.c:825
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Avanceret..."
 
-#: addressbook/gui/component/addressbook.c:995
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -749,7 +764,7 @@ msgstr ""
 "Gør din søgning mere specifik eller øg resultatgrænsen i\n"
 "katalogserverindstillingerne for denne adressebog."
 
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -762,21 +777,21 @@ msgstr ""
 "specifik eller øg resultatgrænsen i katalogserverindstillingerne\n"
 "for denne adressbog."
 
-#: addressbook/gui/component/addressbook.c:1007
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bagenden for denne adressebog kunne ikke forstå forespørgslen."
 
-#: addressbook/gui/component/addressbook.c:1010
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bagenden for denne adressbog nægtede at gennemføre denne forespørgsel."
 
-#: addressbook/gui/component/addressbook.c:1014
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr "Denne forespørgsel udførtes ikke successfuldt."
 
 #. All, unmatched, separator
 #: addressbook/gui/component/addressbook.c:1089
-#: calendar/gui/cal-search-bar.c:352
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr "Enhver kategori"
 
@@ -789,55 +804,54 @@ msgstr "URIen som mappe-skimmeren vil vise"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr "(ingen)"
 
-#: addressbook/gui/component/e-address-popup.c:474
+#: addressbook/gui/component/e-address-popup.c:478
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:1781
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "Primær e-post"
 
-#: addressbook/gui/component/e-address-popup.c:610
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Vælg en handling"
 
-#: addressbook/gui/component/e-address-popup.c:617
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Opret en ny kontakt \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:632
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Tilføj adresse for eksisterende kontakt \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:913
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Kører forespørgsel i adressebog..."
 
-#: addressbook/gui/component/e-address-popup.c:995
-#: addressbook/gui/component/e-address-widget.c:391
-#: addressbook/gui/component/select-names/e-select-names-popup.c:302
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Redigér kontaktinfo"
 
-#: addressbook/gui/component/e-address-popup.c:1025
-#: addressbook/gui/component/e-address-widget.c:427
-#: addressbook/gui/component/select-names/e-select-names-popup.c:481
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Tilføj i kontakter"
 
-#: addressbook/gui/component/e-address-popup.c:1068
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Flet E-postadresse"
 
-#: addressbook/gui/component/e-address-widget.c:368
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Deaktivér forespørgsler"
 
-#: addressbook/gui/component/e-address-widget.c:368
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aktivér forespørgsler (farligt!)"
 
@@ -856,73 +870,56 @@ msgstr "  _Vis de baser som understøttes "
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
-#: mail/mail-config.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
 #: addressbook/gui/component/ldap-config.glade.h:5
-msgid "1234"
-msgstr "1234"
-
-#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "1:00"
 msgstr "1.00"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr "2.30"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
-msgid "380"
-msgstr "380"
-
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "5:00"
 msgstr "5.00"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "666"
-msgstr "666"
-
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "<- _Remove"
-msgstr "<- _Fjern"
-
-#: addressbook/gui/component/ldap-config.glade.h:15
-msgid "<< Fewer Options"
-msgstr "<< Færre alternativer"
-
-#: addressbook/gui/component/ldap-config.glade.h:16
-msgid "Add (or Edit) Attribute Mappings"
-msgstr "Tilføj (eller rediger) attributmappninger"
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "Add LDAP Server"
+msgstr "LDAP-server"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
 msgstr "Adressebogs-kilder"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:60
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Altid"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr "Anonymt"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -935,58 +932,55 @@ msgstr ""
 "\n"
 "Klik på knappen \"Afslut\" for at gemme de indstillinger du har angivet her."
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "DN Customization"
-msgstr "DN-tilpasning"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "S_let"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "LDAP-server"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "E-post-adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution vil anvende dette DN for at godkende dig på servern"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution vil bruge denne adresse til at godkende dig på serveren"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "Færdig"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "LDAP-konfigurationsassistent"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "Mappings"
-msgstr "Mappninger"
-
-#: addressbook/gui/component/ldap-config.glade.h:35 mail/mail-account-gui.c:62
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Aldrig"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -1000,54 +994,26 @@ msgstr ""
 "serverer for kryptografisk at beskytte din tilslutning. Spørg din "
 "systemadministratør om din LDAP-server anvender disse protokoller."
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Objectclasses"
-msgstr "Objektklasser"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
-msgid "Objectclasses Used in Evolution:"
-msgstr "Objektklasser der anvendes i Evolution:"
-
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses Used on Server:"
-msgstr "Objektklasser der anvendes på servern:"
-
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Én"
 
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-"Vælg et Evolution-attribut og en\n"
-"LDAP-attribut at associere dermed."
-
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid "R_estore Defaults"
-msgstr "_Genskab standardinstillinger"
-
-#: addressbook/gui/component/ldap-config.glade.h:46
-msgid "Re_store Defaults"
-msgstr "_Genskab standardalternativ"
-
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "S_øgningsomfang: "
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:48
-#: calendar/gui/calendar-model.c:1977 calendar/gui/e-day-view.c:1669
-#: calendar/gui/e-week-view.c:1227
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 msgid "Searching"
 msgstr "Søger..."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Valgt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -1056,7 +1022,7 @@ msgstr ""
 "At vælge dette alternativ indebærer at Evolution kun vil tilslutte til din\n"
 "LDAP-server hvis den understøtter SSL eller TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -1073,7 +1039,7 @@ msgstr ""
 "på arbejdet behøver Evolution ikke at anvende SSL/TLS eftersom forbindelsen "
 "allerede er sikker."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1086,7 +1052,7 @@ msgstr ""
 "Dette betyder at din forbindelse vil være usikker, og at du bliver \n"
 "sårbar overfor angreb."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
@@ -1095,7 +1061,7 @@ msgstr ""
 "At vælge dette alternativ vil lade dig ændre Evolutions indstillinger\n"
 "for LDAP-søgninger, og for at oprette og redigere kontakter."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
@@ -1103,31 +1069,31 @@ msgstr ""
 "At vælge et visningsnavn er det sidste nødvendige skridt ved konfiguration "
 "af en LDAP-server."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr "Skridt 1: Serverinformation"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr "Skridt 2: Tilslutter server"
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr "Skridt 3: Søger i kataloget"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr "Skridt 4: Viser navn"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Under"
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr "Understøttede søgebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1139,7 +1105,7 @@ msgstr ""
 "brugerinformation. Spørg din systemadministratør hvis du er usikker på denne "
 "information."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1153,7 +1119,7 @@ msgstr ""
 "skal ændre\n"
 "disse."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1165,7 +1131,7 @@ msgstr ""
 "Hvis du efterlader dette tomt kommer søgningen at begynde ved roden af "
 "katalogtræet."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1180,7 +1146,7 @@ msgstr ""
 "Søgeomfanget \"one\" inkluderer alene de poster som er et niveau under din "
 "søgebase.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1197,7 +1163,7 @@ msgstr ""
 "finde\n"
 "denne information."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1205,7 +1171,7 @@ msgstr ""
 "Dette er det komplette navn på din ldap-server. For eksempel \"ldap.mitfirma."
 "dk\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -1215,7 +1181,7 @@ msgstr ""
 "højt\n"
 "sænkes hastigheden på adressebogen."
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1225,7 +1191,7 @@ msgstr ""
 "at sætte dette til \"E-postadresse\" kræver anonym adgang til din ldap-"
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -1234,7 +1200,7 @@ msgstr ""
 "Dette er navnet på denne server, som vises i din Evolution-mappliste.\n"
 "Det anvends kun i forbindelse med visning."
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1245,86 +1211,45 @@ msgstr ""
 "En liste med standard er givet. Spørg din systemadministrator hvilken port "
 "du skal bruge."
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr "Denne indstilling styrer hvor lang tid en søgning må køre."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-"For at tilføje et attribut til DN vælger du den fra listen og klikker på "
-"knappen \"Tilføj attribut\".\n"
-"Alle værdier som du tilføjer DN vil blive nødvendige værdier for alle\n"
-"nye kontakter der tilføjes kataloget på LDAP-serveren."
-
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr "An_vend SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr "Bruger distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr "Bruger e-postadresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-#: mail/mail-account-gui.c:61 mail/mail-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Når det er muligt"
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:86
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:134 shell/glade/e-folder-list.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Tilføj"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
-msgid "_Add ->"
-msgstr "_Tilføj ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:104
-msgid "_Add Mapping"
-msgstr "_Tilføj afbildning"
-
-#: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add to DN"
-msgstr "_Tilføj i DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:106
-msgid "_Always"
-msgstr "_Altid"
-
-#: addressbook/gui/component/ldap-config.glade.h:107
-msgid "_Delete Mapping"
-msgstr "_Fjern afbildning"
-
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr "_Vis navn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Distinguished Name (DN):"
-msgstr "_Distinguished name (DN):"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Don't use SSL/TLS"
-msgstr "_Anvend ikke SSL/TLS"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr "_Nedhæntningsgrænse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:112 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:149 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1333,145 +1258,88 @@ msgstr "_Nedhæntningsgrænse:"
 msgid "_Edit"
 msgstr "R_edigér"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Edit Mapping"
-msgstr "_Rediger afbildning"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
-msgid "_Evolution attribute:"
-msgstr "_Evolution-attribut:"
-
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_If necessary "
-msgstr "_Om nødvendigt "
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_LDAP attribute:"
-msgstr "_LDAP-attribut:"
-
-#: addressbook/gui/component/ldap-config.glade.h:117
-msgid "_LDAP attributes:"
-msgstr "_LDAP-attributer:"
-
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr "_Logindmetode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_More Options >>"
-msgstr "_Flere muligheder >>"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_Restore Defaults"
-msgstr "_Genskab standardværdier"
-
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr "_Udgangspunkt for søgning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "_Servernavn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minutter):"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-msgid "account-druid"
-msgstr "kontoguide"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
-msgid "account-editor"
-msgstr "kontoredigering"
-
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "connecting-tab"
 msgstr "forbindelsesfaneblad"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
-msgid "dn-customization-tab"
-msgstr "dn-tilpasningsfaneblad"
-
-#: addressbook/gui/component/ldap-config.glade.h:130
-msgid "edit_server_window_simple"
-msgstr "redigere_servervindue_enkel"
-
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "general-tab"
 msgstr "generel-faneblad"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "mappings-tab"
-msgstr "afbildningsfaneblad"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
-msgid "objectclasses-tab"
-msgstr "objektklassefaneblad"
-
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "searching-tab"
 msgstr "søgefaneblad"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
 msgstr "Evolution adressebog-komponent"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Fabrik til adressebogens grænseflade for navnevalg"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Fjern alle"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:162
-#: addressbook/gui/component/select-names/e-select-names.c:687
-#: composer/e-msg-composer-attachment-bar.c:504
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:502
 #: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Fjern"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:177
-msgid "Remove All"
-msgstr "Fjern alle"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "Redigér kontaktinfo"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:201
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
 msgid "Send HTML Mail?"
 msgstr "Send HTML e-post?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:401
-msgid "Edit Contact List"
-msgstr "Redigér kontaktliste"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:419
-msgid "Unnamed Contact List"
-msgstr "Kontaktliste uden navn"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:436
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d ikke vist)"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:502
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr "Kontakt uden navn:"
 
-#: addressbook/gui/component/select-names/e-select-names-table-model.c:349
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Kilde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:494
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Vælg kontakter fra adressebogen"
 
-#: addressbook/gui/component/select-names/e-select-names.c:554
+#: addressbook/gui/component/select-names/e-select-names.c:648
 msgid "Find contact in"
 msgstr "Søg kontakt i"
 
@@ -1524,7 +1392,7 @@ msgid "Birthda_y:"
 msgstr "Fø_dselsdag:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
@@ -1535,7 +1403,7 @@ msgstr "Samarbejde"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1331
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -1544,7 +1412,7 @@ msgid "D_epartment:"
 msgstr "Af_deling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:191
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1599,14 +1467,14 @@ msgid "Wants to receive _HTML mail"
 msgstr "Ønsker at modtage e-post som _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:647 calendar/gui/e-calendar-table.c:968
-#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3542
-#: filter/filter.glade.h:15 mail/folder-browser.c:1768
-#: mail/mail-config.glade.h:147 shell/glade/e-folder-list.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
 #: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
 #: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "_Slet"
 
@@ -1636,14 +1504,14 @@ msgstr "_Hjemmeside-adresse:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
-#: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:362
-#: addressbook/gui/widgets/e-minicard-label.c:151
-#: addressbook/gui/widgets/e-minicard-view-widget.c:118
-#: addressbook/gui/widgets/e-minicard-view.c:472
-#: addressbook/gui/widgets/e-minicard.c:176
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:183
 msgid "Editable"
 msgstr "Redigerbar"
 
@@ -2668,48 +2536,48 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:157
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:141
-#: addressbook/gui/widgets/e-addressbook-model.c:297
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:348
-#: addressbook/gui/widgets/e-addressbook-view.c:179
-#: addressbook/gui/widgets/e-minicard-view-widget.c:104
-#: addressbook/gui/widgets/e-minicard-view.c:458
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:459
 msgid "Book"
 msgstr "Bog"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:164
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:148
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
 #: addressbook/gui/widgets/e-minicard-widget.c:93
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr "Kort"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:171
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
 msgid "Is New Card"
 msgstr "Er nyt kort"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:192
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
 msgid "Changed"
 msgstr "Ændret"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:824
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Kategori-redigering ikke tilgængelig."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:832
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakt hører til disse kategorier:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1006
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Gem kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1052
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2717,7 +2585,7 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "fjerne disse kontakter?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1055
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2725,7 +2593,7 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "slette denne kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
@@ -2734,15 +2602,15 @@ msgstr "TTY/TTD"
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunne ikke finde widget for felt: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Hurtig kontakt-tilføjelse"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Redigér alt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "E-post"
 
@@ -2752,15 +2620,15 @@ msgid "Error saving %s: %s"
 msgstr "Fejl ved gemning af %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:211
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2769,7 +2637,7 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 msgid "Overwrite"
 msgstr "Overskriv"
 
@@ -2873,41 +2741,41 @@ msgstr "_Suffiks:"
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "List _name:"
 msgstr "Listenavn:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Members"
 msgstr "Medlemmer"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Type an email address or drag a contact into the list below:"
 msgstr "Skriv en e-postadresse eller træk en kontakt ind i feltet nedenfor:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skjul adresser når du sender e-post til listen"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "contact-list-editor"
 msgstr "kontakt-liste-redigering"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:155
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 msgid "Is New List"
 msgstr "Er ny liste"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:241
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:455
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Gem liste som VCard"
 
@@ -2960,144 +2828,145 @@ msgstr ""
 "Den nye e-post-adresse eller navnet for denne kontakt\n"
 "eksisterer allerede i denne mappe. Vil du tilføje den alligevel?"
 
+#. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:117
-#: widgets/misc/e-filter-bar.c:150
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Avanceret søgning"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:155
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:158
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:161
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:355
-#: addressbook/gui/widgets/e-addressbook-view.c:186
-#: addressbook/gui/widgets/e-minicard-view-widget.c:111
-#: addressbook/gui/widgets/e-minicard-view.c:465
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:466
 msgid "Query"
 msgstr "Forespørgsel"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:441
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 msgid "Error getting book view"
 msgstr "Fejl ved bogvisning"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:369
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 msgid "Model"
 msgstr "Model"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:143
-#: addressbook/gui/widgets/e-addressbook-util.c:104
-#: addressbook/gui/widgets/e-minicard.c:512
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Fejl ved ændring af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1161
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Succes"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:519 shell/e-shell.c:2102
-#: shell/e-storage.c:606 shell/evolution-shell-component.c:1200
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "\"Offline\" lager"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:592
-#: shell/evolution-shell-component.c:1191
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "Tilgang nægtet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Kort ikke fundet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Kort-ID eksisterer allerede"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke understøttet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1185
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2297
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
 #: camel/camel-service.c:737 camel/camel-service.c:779
-#: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: camel/camel-service.c:849 camel/camel-service.c:892
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Godkendelse mislykkedes"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Godkendelse kræves"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgængelig"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Adressbogen findes ikke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Anden fejl"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:74
-#: calendar/gui/dialogs/save-comp.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Vil du gemme ændringene?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr "_Forkast"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Fejl ved tilføjelse af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-util.c:271
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Fejl ved tilføjelse af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:104
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Fejl ved ændring af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:114
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Fejl ved fjernelse af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:114
-#: addressbook/gui/widgets/e-addressbook-util.c:229
-#: addressbook/gui/widgets/e-addressbook-view.c:1740
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Fejl ved fjernelse af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:196
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -3106,123 +2975,132 @@ msgstr ""
 "At åbna %d kort vil yderligere åbne %d nye vinduer.\n"
 "Ønsker du virkelig at vise alle disse kort?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:327
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Flyt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:332
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Flyt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:193
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Flere VCard"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard for %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Adressebog"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:861
-#: addressbook/gui/widgets/e-addressbook-view.c:1868
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gem som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:848
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:849
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
 msgstr "Ny kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Go to Folder..."
 msgstr "Gå til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Import..."
 msgstr "Importér..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
 msgstr "Søg efter kontakter..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Addressbook Sources..."
 msgstr "Adressbogskilder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Pilot Settings..."
 msgstr "Pilotindstillinger..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Send besked til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:864 calendar/gui/print.c:2430
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Udskriv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Udskriv konvolut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Copy to folder..."
 msgstr "Kopiér til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Move to folder..."
 msgstr "Flyt til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klip ud"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Indsæt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:877 filter/libfilter-i18n.h:10
-#: mail/mail-accounts.c:218 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Slet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
-#: calendar/gui/e-day-view.c:3674 calendar/gui/e-week-view.c:3507
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 msgid "Current View"
 msgstr "Aktuel visning"
 
@@ -3230,7 +3108,7 @@ msgstr "Aktuel visning"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,æ,ø,å"
 
@@ -3238,11 +3116,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,æ,ø,å"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,æ,ø,å"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1321
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3313,55 +3191,55 @@ msgstr "Anden telefon"
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-minicard-control.c:203
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr "og %d andre kort."
 
-#: addressbook/gui/widgets/e-minicard-control.c:205
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "og eet andet kort."
 
-#: addressbook/gui/widgets/e-minicard-control.c:319
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "Gem i adressebog"
 
-#: addressbook/gui/widgets/e-minicard-label.c:102
-#: addressbook/gui/widgets/e-minicard.c:139
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
 msgid "Width"
 msgstr "Bredde"
 
-#: addressbook/gui/widgets/e-minicard-label.c:109
-#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
 msgid "Height"
 msgstr "Højde"
 
-#: addressbook/gui/widgets/e-minicard-label.c:116
-#: addressbook/gui/widgets/e-minicard.c:154
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
 msgid "Has Focus"
 msgstr "Har fokus"
 
-#: addressbook/gui/widgets/e-minicard-label.c:123
+#: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Felt"
 
-#: addressbook/gui/widgets/e-minicard-label.c:130
+#: addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Feltnavn"
 
-#: addressbook/gui/widgets/e-minicard-label.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Textmodel"
 
-#: addressbook/gui/widgets/e-minicard-label.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Maximal feltnavnslængde"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Kolonnebredde"
 
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -3375,7 +3253,7 @@ msgstr ""
 "\n"
 "Dobbeltklik her for at oprette en ny kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 msgid ""
 "\n"
 "\n"
@@ -3385,15 +3263,15 @@ msgstr ""
 "\n"
 "Der findes ingen objekter at vise i denne visning."
 
-#: addressbook/gui/widgets/e-minicard-view.c:451
+#: addressbook/gui/widgets/e-minicard-view.c:452
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:162
+#: addressbook/gui/widgets/e-minicard.c:169
 msgid "Selected"
 msgstr "Valgt"
 
-#: addressbook/gui/widgets/e-minicard.c:169
+#: addressbook/gui/widgets/e-minicard.c:176
 msgid "Has Cursor"
 msgstr "Har markør"
 
@@ -3410,12 +3288,12 @@ msgstr "GTK trævisning"
 msgid "Print envelope"
 msgstr "Udskriv konvolut"
 
-#: addressbook/printing/e-contact-print.c:1129
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Udskriv kort"
 
-#: addressbook/printing/e-contact-print.c:1194
-#: addressbook/printing/e-contact-print.c:1216
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
 msgid "Print card"
 msgstr "Udskriv kort"
 
@@ -3488,7 +3366,6 @@ msgid "Include:"
 msgstr "Inkludér:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:638
 msgid "Landscape"
 msgstr "Landskab"
 
@@ -3508,12 +3385,11 @@ msgstr "Margener"
 msgid "Number of columns:"
 msgstr "Antal kolonner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Alternativer"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:625
 msgid "Orientation"
 msgstr "Orientering"
 
@@ -3534,9 +3410,7 @@ msgstr "Papir"
 msgid "Paper source:"
 msgstr "Papirkilde:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:631
 msgid "Portrait"
 msgstr "Portræt"
 
@@ -3592,102 +3466,229 @@ msgstr "Bredde:"
 msgid "_Font..."
 msgstr "Skri_fttype..."
 
-#: calendar/cal-util/cal-component.c:1216
+#: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Unavngivet aftale"
 
-#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr "1."
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "2."
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "3."
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr "4."
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr "5."
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr "6."
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr "7."
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr "8."
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr "9."
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr "10."
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr "11."
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr "12."
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr "13."
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr "14."
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr "15."
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr "16."
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr "17."
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr "18."
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr "19."
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr "20."
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr "21."
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "22."
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "23."
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr "24."
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr "25."
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr "26."
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr "27."
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr "28."
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr "29."
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr "30."
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr "31."
+
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "Høj"
 
-#: calendar/cal-util/cal-util.c:501 calendar/cal-util/cal-util.c:523
-#: calendar/gui/calendar-model.c:1703
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:503 calendar/cal-util/cal-util.c:525
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "Lav"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:519
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 #: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: calendar/conduits/calendar/calendar-conduit.c:204
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Dél flerdagshændelser:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1214
-#: calendar/conduits/todo/todo-conduit.c:823
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Fejl under kommunikation med kalenderserveren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1361
-#: calendar/conduits/calendar/calendar-conduit.c:1364
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke læse pilotens kalender-applikationsblok"
 
-#: calendar/conduits/todo/todo-conduit.c:204
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Standardprioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:939
-#: calendar/conduits/todo/todo-conduit.c:942
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke læse pilotens applikationsblok for opgaveliste"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "En Bonobo-kontrol der viser en opgaveliste."
+msgid "Calendar and Tasks"
+msgstr "Kalender og opgaver"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "En Bonobo-kontrol der viser en kalender."
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurér din tidszone, kalender og opgaveliste her "
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
 msgstr "Kalender og opgaver"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Konfigurationsværktøj for Evolution-kalendern."
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution-komponent for e-post mappevisning."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfigurér din tidszone, kalender og opgaveliste her "
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution komponent for e-postmappe fabrik."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
 msgstr "Evolution kalender iTip/iMip-visning"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution komponent for håndtering af kalenderen."
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalender iTip/iMip-visning"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Fabrik for Evolution-kalenderobjekter"
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender iTip/iMip-visning"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr ""
-"Fabrik til centralisering af dialoger for kalender-komponent-redigering"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.h:1
-msgid "Alarm notification service"
-msgstr "Alarm-tjeneste"
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolutionalarm"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
 msgstr "Fabrik til alarm-tjenesten"
 
 # Konteksten er planlægning af opgaver. Dette er tidspunktet for begyndelsen
@@ -3729,17 +3730,17 @@ msgstr "Udsæt-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_edigér aftale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgængelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:742
-#: calendar/gui/alarm-notify/alarm-queue.c:766
-#: calendar/gui/tasks-control.c:454 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Advarsel"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:746
+#: calendar/gui/alarm-notify/alarm-queue.c:849
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3751,7 +3752,7 @@ msgstr ""
 "at sende e-post. Evolution vil vise en normal dialog\n"
 "for påmindelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3768,7 +3769,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil køre dette program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:786
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 msgid "Do not ask me about this program again."
 msgstr "Spørg mig ikke om dette program igen."
 
@@ -3792,7 +3793,7 @@ msgstr "Beskrivelse indeholder"
 msgid "Comment contains"
 msgstr "Kommentar indeholder"
 
-#: calendar/gui/cal-search-bar.c:356 mail/mail-ops.c:1106
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr "Ingen træffere"
 
@@ -3802,8 +3803,8 @@ msgstr "%A den %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-day-view.c:1387 calendar/gui/e-week-view-main-item.c:312
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d. %b"
 
@@ -3821,7 +3822,7 @@ msgstr "%d. %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:432
-#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1489
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3832,154 +3833,155 @@ msgstr ""
 "Kunne ikke oprette kalendervisning. Kontrollér venligs din konfiguration af "
 "ORBit og OAF."
 
-#: calendar/gui/calendar-component.c:71 calendar/gui/gnome-cal.c:1341
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1084
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/calendar-component.c:72
+#: calendar/gui/calendar-component.c:71
 msgid "Folder containing appointments and events"
 msgstr "Mappe som indeholder aftaler og hændelser"
 
-#: calendar/gui/calendar-component.c:76
+#: calendar/gui/calendar-component.c:75
 msgid "Public Calendar"
 msgstr "Offentlig kalender"
 
-#: calendar/gui/calendar-component.c:77
+#: calendar/gui/calendar-component.c:76
 msgid "Public folder containing appointments and events"
 msgstr "Offentlig mappe som indeholder mødelser og hændelser"
 
-#: calendar/gui/calendar-component.c:81 calendar/gui/e-tasks.c:735
-#: calendar/gui/print.c:1775 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:705
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:326
-#: my-evolution/e-summary-tasks.c:344 shell/e-local-storage.c:183
-#: shell/e-shortcuts.c:1085
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Opgaver"
 
-#: calendar/gui/calendar-component.c:82
+#: calendar/gui/calendar-component.c:81
 msgid "Folder containing to-do items"
 msgstr "Mappe som indeholder opgaver"
 
-#: calendar/gui/calendar-component.c:86
+#: calendar/gui/calendar-component.c:85
 msgid "Public Tasks"
 msgstr "Offentlige opgaver"
 
-#: calendar/gui/calendar-component.c:87
+#: calendar/gui/calendar-component.c:86
 msgid "Public folder containing to-do items"
 msgstr "Offentlig mappe som indeholder gøremål"
 
-#: calendar/gui/calendar-component.c:739
+#: calendar/gui/calendar-component.c:730
 msgid "New appointment"
 msgstr "Nyt møde"
 
-#: calendar/gui/calendar-component.c:739
+#: calendar/gui/calendar-component.c:730
 msgid "_Appointment"
 msgstr "_Møde"
 
-#: calendar/gui/calendar-component.c:740
+#: calendar/gui/calendar-component.c:731
 msgid "Create a new appointment"
 msgstr "Opret en ny aftale"
 
-#: calendar/gui/calendar-component.c:744
+#: calendar/gui/calendar-component.c:735
 msgid "New meeting"
 msgstr "Nyt møde"
 
-#: calendar/gui/calendar-component.c:744
+#: calendar/gui/calendar-component.c:735
 msgid "_Meeting"
 msgstr "_Møde"
 
-#: calendar/gui/calendar-component.c:745
+#: calendar/gui/calendar-component.c:736
 msgid "Create a new meeting request"
 msgstr "Opret en ny mødeindkaldelse"
 
-#: calendar/gui/calendar-component.c:749
+#: calendar/gui/calendar-component.c:740
 msgid "New task"
 msgstr "Nyt gøremål"
 
-#: calendar/gui/calendar-component.c:749
+#: calendar/gui/calendar-component.c:740
 msgid "_Task"
 msgstr "_Opgave"
 
-#: calendar/gui/calendar-component.c:750
+#: calendar/gui/calendar-component.c:741
 msgid "Create a new task"
 msgstr "Opret en ny opgave"
 
-#: calendar/gui/calendar-component.c:754
+#: calendar/gui/calendar-component.c:745
 msgid "New All Day Appointment"
 msgstr "Nyt heldagsmøde"
 
-#: calendar/gui/calendar-component.c:754
+#: calendar/gui/calendar-component.c:745
 msgid "All _Day Appointment"
 msgstr "Hel_dagsmøde"
 
-#: calendar/gui/calendar-component.c:755
+#: calendar/gui/calendar-component.c:746
 msgid "Create a new all-day appointment"
 msgstr "Opret et nyt heldagsmøde"
 
-#: calendar/gui/calendar-model.c:406 calendar/gui/calendar-model.c:965
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
 #: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:409 calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
 #: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Fortroligt"
 
-#: calendar/gui/calendar-model.c:412 calendar/gui/e-calendar-table.c:371
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/calendar-model.c:524
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:524
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:526
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "Ø"
 
-#: calendar/gui/calendar-model.c:526
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:591 calendar/gui/calendar-model.c:1135
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
 #: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/calendar-model.c:593 calendar/gui/e-calendar-table.c:446
-#: calendar/gui/e-meeting-time-sel.c:409
-#: shell/evolution-shell-component.c:1185
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr "Optaget"
 
-#: calendar/gui/calendar-model.c:744 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2288
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1181
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2291
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "I gang"
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:305
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/print.c:2294
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "Fuldført"
 
-#: calendar/gui/calendar-model.c:1037
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3990,32 +3992,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1177 calendar/gui/dialogs/meeting-page.c:288
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1976
-#: mail/folder-browser.c:1730 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1655 mail/mail-accounts.c:386
-#: mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:196
-#: widgets/misc/e-cell-date-edit.c:254 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1481 widgets/misc/e-dateedit.c:1596
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:79
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Genindtræffer"
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:277
-#: calendar/gui/e-meeting-model.c:287 calendar/gui/e-meeting-model.c:543
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
 #: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
 #: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Nej"
@@ -4036,198 +4038,109 @@ msgstr "Ugevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
+#: calendar/gui/comp-editor-factory.c:456
+#, fuzzy
+msgid "Error while opening the calendar"
+msgstr "Fejl under kommunikation med kalenderserveren"
+
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:473
+#, fuzzy
+msgid "Permission denied to open the calendar"
+msgstr "Tilgang nægtet"
+
 #: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Kunne ikke åbne mappen i \"%s\""
 
-#: calendar/gui/control-factory.c:163
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: calendar/gui/control-factory.c:170
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Typen af visning der skal bruges"
 
-#: calendar/gui/dialogs/alarm-options.c:358
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Alternativer for lyd-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:367
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Alternativer for beskedsalarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:376
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Alternativer for e-post-alarm"
 
-#: calendar/gui/dialogs/alarm-options.c:385
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Alternativer for program-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:394
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Alternativer for ukendte alarmer"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Gentagelse af alarm"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
-msgstr ""
-"Evolution understøtter endnu ikke e-postnotificering for påmindelser. Det "
-"vil ikke være muligt at redigere mulighederne for denne påmindelse."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Besked som skal vises"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Beskedskrop"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Afspil lyd:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Gentag alarmen"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Kør program:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Send"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Med disse argumenter:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:68
-#: filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
 msgid "days"
 msgstr "dage"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "ekstra gange hver"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:67
-#: filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "timer"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:66
-#: filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:311 calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d dage"
-
-#: calendar/gui/dialogs/alarm-page.c:314 calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 dag"
-
-#: calendar/gui/dialogs/alarm-page.c:319 calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d uger"
-
-#: calendar/gui/dialogs/alarm-page.c:322 calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 uge"
-
-#: calendar/gui/dialogs/alarm-page.c:327 calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d timer"
-
-#: calendar/gui/dialogs/alarm-page.c:330 calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 time"
-
-#: calendar/gui/dialogs/alarm-page.c:335 calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d minutter"
-
-#: calendar/gui/dialogs/alarm-page.c:338 calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 minut"
-
-#: calendar/gui/dialogs/alarm-page.c:343 calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekunder"
-
-#: calendar/gui/dialogs/alarm-page.c:346 calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 sekund"
-
-#: calendar/gui/dialogs/alarm-page.c:375
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:459
-msgid "Play a sound"
-msgstr "Afspil en lyd"
-
-#: calendar/gui/dialogs/alarm-page.c:379
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:463
-msgid "Display a message"
-msgstr "Vis en besked"
-
-#: calendar/gui/dialogs/alarm-page.c:383 calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Send en besked"
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:471
-msgid "Run a program"
-msgstr "Kør et program"
-
-#: calendar/gui/dialogs/alarm-page.c:393 calendar/gui/e-alarm-list.c:477
-msgid "Unknown action to be performed"
-msgstr "Ukendt handling som skal udføres"
-
-#: calendar/gui/dialogs/alarm-page.c:405 calendar/gui/e-alarm-list.c:489
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s før aftalen starter"
-
-#: calendar/gui/dialogs/alarm-page.c:408 calendar/gui/e-alarm-list.c:492
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s efter aftalen er startet"
-
-#: calendar/gui/dialogs/alarm-page.c:413 calendar/gui/e-alarm-list.c:497
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s ved aftalens start"
-
-#: calendar/gui/dialogs/alarm-page.c:422 calendar/gui/e-alarm-list.c:506
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s før aftalen slutter"
-
-#: calendar/gui/dialogs/alarm-page.c:425 calendar/gui/e-alarm-list.c:509
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s efter aftalens slutning"
-
-#: calendar/gui/dialogs/alarm-page.c:430 calendar/gui/e-alarm-list.c:514
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s ved aftalens slutning"
-
-#: calendar/gui/dialogs/alarm-page.c:454 calendar/gui/e-alarm-list.c:538
-#, c-format
-msgid "%s at %s"
-msgstr "%s ved %s"
-
-#: calendar/gui/dialogs/alarm-page.c:460 calendar/gui/e-alarm-list.c:544
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s for en ukendt udløsertype"
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4238,46 +4151,63 @@ msgstr "Basis"
 msgid "Date/Time:"
 msgstr "Dato/klokke:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Vis en besked"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Afspil en lyd"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Påmindelser"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Kør et program"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Send en besked"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:804 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Alternativer..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "efter"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "før"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "dag(er)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "slutning på aftale"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:179
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "minutt(er)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "start på aftale"
 
@@ -4326,7 +4256,8 @@ msgid "Days"
 msgstr "Dage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1091
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Fredag"
 
@@ -4339,7 +4270,8 @@ msgid "Minutes"
 msgstr "Minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1087
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Mandag"
 
@@ -4348,7 +4280,8 @@ msgid "S_un"
 msgstr "_søn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -4361,7 +4294,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Vis uge_nummer i datonavigation"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1093
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -4378,7 +4312,8 @@ msgid "Task List"
 msgstr "Opgaveliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -4395,7 +4330,8 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -4404,7 +4340,8 @@ msgid "W_eek starts:"
 msgstr "_Ugen begynder:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -4486,28 +4423,28 @@ msgstr "_Ons"
 msgid "before every appointment"
 msgstr "før hvert møde"
 
-#: calendar/gui/dialogs/cancel-comp.c:55
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 "Hændelsen som fjernes er et møde. Vil du sende en aflysningsmeddelelse?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Er du sikker på, at du vil aflyse og slette dette møde?"
 
-#: calendar/gui/dialogs/cancel-comp.c:64
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr "Opgaven som fjernes er tildelt. Vil du sende en aflysningsmeddelselse?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Er du sikker på, at du vil aflyse og slette denne opgave?"
 
-#: calendar/gui/dialogs/cancel-comp.c:73
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -4515,7 +4452,7 @@ msgstr ""
 "Journalindgangen som fjernes er offentliggjort. Vil du sende en "
 "aflysningsmeddelelse?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Er du sikker på, at du vil aflyse og slette denne journalopføring?"
 
@@ -4572,81 +4509,81 @@ msgstr "%s  Du har ikke gjort ændringer. Opdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfejl: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2206
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2210
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
 msgstr " (Fuldført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2212
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 msgid "Completed "
 msgstr "Fuldført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2217
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr " (Færdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr "Færdig "
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:328
 msgid "Could not update invalid object"
 msgstr "Kunne ikke opdatera ugyldigt objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:325
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr "Objektet kunne ikke findes, derfor ikke opdaterat"
 
-#: calendar/gui/dialogs/comp-editor.c:328
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr "Du har ikke rettigheder til at opdatere dette objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:331
+#: calendar/gui/dialogs/comp-editor.c:337
 msgid "Could not update object"
 msgstr "Kunne ikke opdatere objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:777
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Redigér aftale"
 
-#: calendar/gui/dialogs/comp-editor.c:782
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:785
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:788
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalopføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:799
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1206
-#: calendar/gui/e-calendar-table.c:1035 calendar/gui/e-day-view.c:3929
-#: calendar/gui/e-week-view.c:3740 composer/e-msg-composer.c:1152
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr "Gem som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1307
 #: calendar/gui/dialogs/comp-editor.c:1331
 #: calendar/gui/dialogs/comp-editor.c:1355
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1379
+#, fuzzy
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Ændringer i dette objekt kan bliver muligvis ignoreret hvis en opdatering "
 "ankommer via e-post"
 
-#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versionsdata!"
 
@@ -4704,103 +4641,98 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Indtast delegat"
 
-#: calendar/gui/dialogs/event-editor.c:197 calendar/gui/print.c:2245
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "Aftale"
 
-#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Påmindelse"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Genindtræffelse"
 
-#: calendar/gui/dialogs/event-editor.c:212
-#: calendar/gui/dialogs/event-editor.c:279
-#: calendar/gui/dialogs/event-editor.c:412
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr "Mødeplanlægning"
 
-#: calendar/gui/dialogs/event-editor.c:217
-#: calendar/gui/dialogs/event-editor.c:282
-#: calendar/gui/dialogs/event-editor.c:415 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Møde"
 
-#: calendar/gui/dialogs/event-page.c:636 calendar/gui/dialogs/task-page.c:546
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
 msgid "Start date is wrong"
 msgstr "Startdatoen er forkert"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "Slutdatoen er forkert"
 
-#: calendar/gui/dialogs/event-page.c:669
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "Starttiden er forkert"
 
-#: calendar/gui/dialogs/event-page.c:676
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "Sluttiden er forkert"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "Varer he_le dagen"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "_Optaget"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klassificering"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "Kon_fidensiel"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Dato & tid"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "L_edig"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "Geografisk lokation:"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Of_fentlig"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Vis tid som"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Kontakter..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "S_lut-tid:"
@@ -4809,19 +4741,23 @@ msgstr "S_lut-tid:"
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:391
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr "En organisator er påkrævet."
 
-#: calendar/gui/dialogs/meeting-page.c:415
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "Mindst en deltager er nødvendig"
 
-#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "Denne person er allerede sat op til dette møde!"
 
-#: calendar/gui/dialogs/meeting-page.c:643
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
@@ -4861,14 +4797,14 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "SU"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4883,98 +4819,83 @@ msgid "_Change Organizer"
 msgstr "Æn_dr organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:427
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr "_Invitér andre..."
 
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:162
-msgid "st"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:153
-msgid "nd"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:154
-msgid "rd"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:147
-#: calendar/gui/dialogs/recurrence-page.c:148
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:155
-#: calendar/gui/dialogs/recurrence-page.c:156
-#: calendar/gui/dialogs/recurrence-page.c:157
-#: calendar/gui/dialogs/recurrence-page.c:158
-#: calendar/gui/dialogs/recurrence-page.c:159
-#: calendar/gui/dialogs/recurrence-page.c:160
-#: calendar/gui/dialogs/recurrence-page.c:161
-msgid "th"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:582
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:75
+#, fuzzy
+msgid "This and Future Instances"
+msgstr "Wallis- og Futuna-øerne"
+
+#: calendar/gui/dialogs/recur-comp.c:77
+#, fuzzy
+msgid "All Instances"
+msgstr "Alliance"
+
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Denne aftale har genindtræffelser som ikke kan redigeres af Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:858
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+#, fuzzy
+msgid "Recurrence date is invalid"
 msgstr "Gentagelsesdatoen er forkert"
 
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "på"
 
-#: calendar/gui/dialogs/recurrence-page.c:1028
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr "første"
 
-#: calendar/gui/dialogs/recurrence-page.c:1029 filter/filter-datespec.c:65
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "anden"
 
-#: calendar/gui/dialogs/recurrence-page.c:1030
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr "tredje"
 
-#: calendar/gui/dialogs/recurrence-page.c:1031
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr "fjerde"
 
-#: calendar/gui/dialogs/recurrence-page.c:1032
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr "sidste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1058
+#: calendar/gui/dialogs/recurrence-page.c:1004
 msgid "Other Date"
 msgstr "Anden dato"
 
-#: calendar/gui/dialogs/recurrence-page.c:1086 filter/filter-datespec.c:68
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1226
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1411
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "gentagelser"
 
@@ -5038,23 +4959,23 @@ msgstr "uge(r)"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr "Mødesinformationen er blevet genereret. Send den?"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Mødeinformationen er ændret. Send en opdateret version?"
 
-#: calendar/gui/dialogs/send-comp.c:65
+#: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
 msgstr "Opgaveinformationen er genereret. Send den?"
 
-#: calendar/gui/dialogs/send-comp.c:69
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr "Opgaveinformationen er ændret. Send en opdateret version?"
 
-#: calendar/gui/dialogs/task-details-page.c:398
+#: calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "Udførelsesdatoen er forkert"
 
@@ -5068,44 +4989,38 @@ msgstr "% færdig"
 msgid "Date Completed:"
 msgstr "Dato for fuldførelse:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:295 calendar/gui/e-meeting-model.c:318
-#: calendar/gui/e-meeting-model.c:549 calendar/gui/e-meeting-model.c:851
-msgid "Needs Action"
-msgstr "Behøver handling"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Fremgang"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:630
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:186
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Grundlæggende"
 
-#: calendar/gui/dialogs/task-editor.c:196
-#: calendar/gui/dialogs/task-editor.c:241
-#: calendar/gui/dialogs/task-editor.c:366
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:519
+#: calendar/gui/dialogs/task-page.c:527
 msgid "Due date is wrong"
 msgstr "Forfaldsdatoen er forkert"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:858
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
@@ -5115,124 +5030,232 @@ msgstr "Beskrivelse:"
 msgid "Sta_rt Date:"
 msgstr "Sta_rt dato:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Kontakter..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Fær_dig-dato:"
 
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d dage"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 dag"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d uger"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 uge"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d timer"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 time"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutter"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 minut"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekunder"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 sekund"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Send en besked"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Ukendt handling som skal udføres"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s før aftalen starter"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s efter aftalen er startet"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s ved aftalens start"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s før aftalen slutter"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s efter aftalens slutning"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s ved aftalens slutning"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s ved %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s for en ukendt udløsertype"
+
 #: calendar/gui/e-calendar-table.c:415
+#, c-format
 msgid "0%"
 msgstr "0%"
 
 #: calendar/gui/e-calendar-table.c:416
+#, c-format
 msgid "10%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:417
+#, c-format
 msgid "20%"
 msgstr "20%"
 
 #: calendar/gui/e-calendar-table.c:418
+#, c-format
 msgid "30%"
 msgstr "30%"
 
 #: calendar/gui/e-calendar-table.c:419
+#, c-format
 msgid "40%"
 msgstr "40%"
 
 #: calendar/gui/e-calendar-table.c:420
+#, c-format
 msgid "50%"
 msgstr "50%"
 
 #: calendar/gui/e-calendar-table.c:421
+#, c-format
 msgid "60%"
 msgstr "60%"
 
 #: calendar/gui/e-calendar-table.c:422
+#, c-format
 msgid "70%"
 msgstr "70%"
 
 #: calendar/gui/e-calendar-table.c:423
+#, c-format
 msgid "80%"
 msgstr "80%"
 
 #: calendar/gui/e-calendar-table.c:424
+#, c-format
 msgid "90%"
 msgstr "90%"
 
 #: calendar/gui/e-calendar-table.c:425
+#, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2824
-#: calendar/gui/e-week-view.c:1904
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1910
 msgid "Deleting selected objects"
 msgstr "Sletter de valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:949 calendar/gui/e-day-view.c:3696
-#: calendar/gui/e-week-view.c:3524 mail/folder-browser.c:1741
-#: shell/e-shortcuts-view.c:416 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Åbn"
 
-#: calendar/gui/e-calendar-table.c:950
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr "_Gem som..."
 
-#: calendar/gui/e-calendar-table.c:951 calendar/gui/e-day-view.c:3698
-#: calendar/gui/e-week-view.c:3499 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_kriv ud..."
 
-#: calendar/gui/e-calendar-table.c:955 calendar/gui/e-day-view.c:3703
-#: calendar/gui/e-week-view.c:3531 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klip _ud"
 
-#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3704
-#: calendar/gui/e-week-view.c:3532 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopiér"
 
-#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3669
-#: calendar/gui/e-day-view.c:3705 calendar/gui/e-week-view.c:3503
-#: calendar/gui/e-week-view.c:3533 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Indsæt"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr "_Tildel opgave"
 
-#: calendar/gui/e-calendar-table.c:962
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:963
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "_Markér som fuldført"
 
-#: calendar/gui/e-calendar-table.c:964
+#: calendar/gui/e-calendar-table.c:965
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markér valgte opgaver som komplette"
 
-#: calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "Sle_t valgte opgaver"
 
-#: calendar/gui/e-calendar-table.c:1239 calendar/gui/e-day-view.c:7551
-#: calendar/gui/e-week-view.c:4218
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
-#: calendar/gui/e-calendar-table.c:1322
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klik for at tilføje en opgave"
@@ -5241,8 +5264,8 @@ msgstr "Klik for at tilføje en opgave"
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1000
-#: camel/camel-filter-driver.c:1095
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Fuldført"
 
@@ -5271,8 +5294,8 @@ msgid "Start Date"
 msgstr "Startdato"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:54 shell/e-shell.c:765
-#: shell/e-shortcuts.c:1081
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -5303,133 +5326,212 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:531
+#: calendar/gui/e-day-view-time-item.c:529
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters opdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:262 calendar/gui/e-day-view.c:1373
-#: calendar/gui/e-week-view-main-item.c:303 calendar/gui/print.c:1505
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:270 calendar/gui/e-day-view.c:1400
-#: calendar/gui/e-week-view-main-item.c:326
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:610 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:789
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:613 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-day-view.c:3653
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Ny _aftale"
 
-#: calendar/gui/e-day-view.c:3655 calendar/gui/e-week-view.c:3493
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "Ny aftale som varer h_ele dagen"
 
-#: calendar/gui/e-day-view.c:3657 calendar/gui/e-week-view.c:3494
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 msgid "New Meeting"
 msgstr "Nyt møde"
 
-#: calendar/gui/e-day-view.c:3659 calendar/gui/e-week-view.c:3495
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "Ny opgave"
 
-#: calendar/gui/e-day-view.c:3664 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Udskriv..."
 
-#: calendar/gui/e-day-view.c:3676 calendar/gui/e-week-view.c:3509
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-day-view.c:3678 calendar/gui/e-week-view.c:3510
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3514
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Udgiv ledig/optaget-information"
 
-#: calendar/gui/e-day-view.c:3688 calendar/gui/e-week-view.c:3518
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
+#: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Indstillinger..."
 
-#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3525
-#: mail/folder-browser.c:1743 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Gem _som..."
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 msgid "_Schedule Meeting..."
 msgstr "_Book møde..."
 
-#: calendar/gui/e-day-view.c:3710 calendar/gui/e-week-view.c:3538
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3543
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr "Gør denne hændelse _flytbar"
 
-#: calendar/gui/e-day-view.c:3716 calendar/gui/e-week-view.c:3544
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr "Slet denne _hændelse"
 
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr "Slet _alle hændelser"
 
-#: calendar/gui/e-itip-control.c:585
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "Simpel genindtræffel_se"
+
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "Hver"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d dage"
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "Hver"
+
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr "%d uger"
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Every week on "
+msgstr "Evergreen"
+
+#: calendar/gui/e-itip-control.c:731
+#, fuzzy, c-format
+msgid "Every %d weeks on "
+msgstr "%d uger"
+
+#: calendar/gui/e-itip-control.c:739
+#, fuzzy
+msgid " and "
+msgstr "Sand"
+
+#: calendar/gui/e-itip-control.c:746
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:764
+#, fuzzy
+msgid "every month"
+msgstr "E_n måned"
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:775
+#, fuzzy
+msgid "Every year"
+msgstr "Hver"
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr "<b>Begynder:</b>"
 
-#: calendar/gui/e-itip-control.c:595
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr "<b>Slutter:<b>"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr "<b>Færdig:</b> "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr "<b>Udføres inden:</b> "
 
-#: calendar/gui/e-itip-control.c:655 calendar/gui/e-itip-control.c:705
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "iCalendar-fejl"
 
-#: calendar/gui/e-itip-control.c:736 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:763 calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 msgid "An unknown person"
 msgstr "en ukendt afsender"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:787
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5437,339 +5539,339 @@ msgstr ""
 "<br>Kontrollér venligst følgende information og vælg så en handling fra "
 "menuen nedenfor."
 
-#: calendar/gui/e-itip-control.c:802
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Sted:"
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:831 calendar/gui/e-meeting-model.c:297
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:852
-#: calendar/gui/itip-utils.c:486
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Accepteret"
 
-#: calendar/gui/e-itip-control.c:835 calendar/gui/itip-utils.c:489
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Preliminært godtaget"
 
-#: calendar/gui/e-itip-control.c:839 calendar/gui/e-meeting-model.c:299
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:853
-#: calendar/gui/itip-utils.c:492 calendar/gui/itip-utils.c:518
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Afslået"
 
-#: calendar/gui/e-itip-control.c:843 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:268
-#: calendar/gui/e-meeting-model.c:333 calendar/gui/e-meeting-model.c:810
-#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1531
-#: camel/camel-gpg-context.c:1581 camel/camel-tcp-stream-openssl.c:629
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:345
-#: mail/mail-display.c:918 widgets/misc/e-charset-picker.c:59
-#: widgets/misc/e-charset-picker.c:446
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: calendar/gui/e-itip-control.c:896 calendar/gui/e-itip-control.c:924
-#: calendar/gui/e-itip-control.c:950 calendar/gui/e-itip-control.c:963
-#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 msgid "Choose an action:"
 msgstr "Vælg en handling"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:929
-#: calendar/gui/e-itip-control.c:952 calendar/gui/e-itip-control.c:965
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:991
-#: shell/e-shell.c:2092 widgets/misc/e-cell-date-edit.c:262
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "O.k."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:926
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Foreslået"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Afslået"
 
-#: calendar/gui/e-itip-control.c:951
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Send oplysning om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:964
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Opdaterer modpartens status"
 
-#: calendar/gui/e-itip-control.c:977
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Send nyeste oplysninger"
 
-#: calendar/gui/e-itip-control.c:990 calendar/gui/itip-utils.c:506
-#: shell/evolution-shell-component.c:1163 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har offentliggjort mødeoplysning."
 
-#: calendar/gui/e-itip-control.c:1072
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Mødeinformation"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ønsker at %s er til stede ved et møde."
 
-#: calendar/gui/e-itip-control.c:1079
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> beder om din tilstedeværelse i et møde."
 
-#: calendar/gui/e-itip-control.c:1080
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Mødeforslag"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ønsker at tilføje information til et eksisterende møde."
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Mødeopdatering"
 
-#: calendar/gui/e-itip-control.c:1089
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ønsker at modtage seneste mødeinformation."
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Anmodning om mødeopdatering"
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svaret på en mødeforespørgsel."
 
-#: calendar/gui/e-itip-control.c:1098
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Mødesvar"
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har aflyst et møde."
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Mødeaflysing"
 
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt en uforståelig besked."
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Ugyldig mødebesked"
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har offentliggjort information om en opgave."
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ønsker at %s udfører en opgave."
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> anmoder om at du udfører en opgave."
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Forslag om opgave"
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ønsker at tilføje information til en eksisterende opgave."
 
-#: calendar/gui/e-itip-control.c:1152
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ønsker at modtage den seneste information om opgaven."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Anmodning om opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svaret på en opgavetildeling."
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Svar på opgave"
 
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har aflyst en opgave."
 
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Aflysing af opgave"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Ugyldig opgavebesked"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publiseret ledig/optaget-information."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> anmoder om din oplysning om ledig/optaget."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Forespørgsel om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 "<b>%s</b> har svaret på en forespørgsel efter oplysning om ledig/optaget."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Svar på ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelelsen ser ikke ud til at være korrekt udformet"
 
-#: calendar/gui/e-itip-control.c:1352
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Denne besked indeholder forespørgsler, som ikke er understøttet."
 
-#: calendar/gui/e-itip-control.c:1380 calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilaget indeholder ikke en gyldig kalender-besked"
 
-#: calendar/gui/e-itip-control.c:1411
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilaget har ingen synlige kalender-elementer"
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1724
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldigt og kan ikke opdateres\n"
 
-#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 msgid "There was an error on the CORBA system\n"
 msgstr "Der opstod en fejl i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1638 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 msgid "Object could not be found\n"
 msgstr "Objektet kunne ikke findes\n"
 
-#: calendar/gui/e-itip-control.c:1641
+#: calendar/gui/e-itip-control.c:1916
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Du har ikke rettigheder til at opdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Opdatering fuldført\n"
 
-#: calendar/gui/e-itip-control.c:1647
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1676 calendar/gui/e-itip-control.c:1742
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltagerstatus kan ikke opdateres, fordi elementet ikke længere eksisterer"
 
-#: calendar/gui/e-itip-control.c:1697
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dette svar er ikke fra en nuværende mødesdeltager. Tilføj som mødesdeltager?"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltagerstatus kunne ikke opdateres pga. ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1733
+#: calendar/gui/e-itip-control.c:2008
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har ikke rettigheder for at opdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1736
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Deltagerstatus opdateret\n"
 
-#: calendar/gui/e-itip-control.c:1739
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltagerstatus kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1774
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Fjernelse fuldført"
 
-#: calendar/gui/e-itip-control.c:1804 calendar/gui/e-itip-control.c:1854
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr "Elementet sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:1931
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Vælg kalendermappe"
 
-#: calendar/gui/e-itip-control.c:1938
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Vælg opgavefolder"
 
@@ -5810,180 +5912,185 @@ msgstr "slut-dato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Formænd"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1736
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr "Obligatoriske deltagere"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Valgfrie deltagere"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:83
 msgid "Resources"
 msgstr "Ressourcer"
 
-#: calendar/gui/e-meeting-model.c:208 calendar/gui/e-meeting-model.c:225
-#: calendar/gui/e-meeting-model.c:539 calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr "Individuel"
 
-#: calendar/gui/e-meeting-model.c:210 calendar/gui/e-meeting-model.c:227
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
 #: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-model.c:212 calendar/gui/e-meeting-model.c:229
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
 #: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "Ressourse"
 
-#: calendar/gui/e-meeting-model.c:214 calendar/gui/e-meeting-model.c:231
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
 #: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr "Rum"
 
-#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:260
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
 #: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr "Formand"
 
-#: calendar/gui/e-meeting-model.c:245 calendar/gui/e-meeting-model.c:262
-#: calendar/gui/e-meeting-model.c:541 calendar/gui/e-meeting-model.c:823
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr "Obligatorisk deltager"
 
-#: calendar/gui/e-meeting-model.c:247 calendar/gui/e-meeting-model.c:264
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
 #: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr "Valgfri deltager"
 
-#: calendar/gui/e-meeting-model.c:249 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
 #: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr "Ikke-deltager"
 
-#: calendar/gui/e-meeting-model.c:301 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+msgid "Needs Action"
+msgstr "Behøver handling"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr "Foreslået"
 
-#: calendar/gui/e-meeting-model.c:303 calendar/gui/e-meeting-model.c:326
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
 #: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr "Delegeret"
 
-#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 msgid "In Process"
 msgstr "I gang"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:453
-#: calendar/gui/e-meeting-time-sel.c:2077
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr "%A den %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:457
-#: calendar/gui/e-meeting-time-sel.c:2107 e-util/e-time-utils.c:189
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
 #: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m-%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:461 e-util/e-time-utils.c:224
-#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1605
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
 msgid "%m/%d/%Y"
 msgstr "%d/%m-%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:410 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ude"
 
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Ingen information"
 
-#: calendar/gui/e-meeting-time-sel.c:449
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Tilvalg"
 
-#: calendar/gui/e-meeting-time-sel.c:469
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Vis k_un arbejdstid"
 
-#: calendar/gui/e-meeting-time-sel.c:483
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Vis _zoomet ud"
 
-#: calendar/gui/e-meeting-time-sel.c:501
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Opdatér ledig/optaget"
 
-#: calendar/gui/e-meeting-time-sel.c:519
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr "_Autovælg"
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr "_>>"
 
-#: calendar/gui/e-meeting-time-sel.c:569
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr "_Alle mennesker og ressourser"
 
-#: calendar/gui/e-meeting-time-sel.c:582
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Alle _mennesker og en ressourse"
 
-#: calendar/gui/e-meeting-time-sel.c:595
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "_Obligatoriske deltagere"
 
-#: calendar/gui/e-meeting-time-sel.c:608
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Obligatoriske deltagere _og en ressourse"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Tid for mødets _start:"
 
-#: calendar/gui/e-meeting-time-sel.c:650
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Tid for mødets slutning:"
 
-#: calendar/gui/e-tasks.c:356 calendar/gui/gnome-cal.c:2011
-#: calendar/gui/gnome-cal.c:2022
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åbner lager %s"
 
-#: calendar/gui/e-tasks.c:385 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke indlæse opgaverne i `%s'"
 
-#: calendar/gui/e-tasks.c:400
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Den nødvendige metode til indlæsning af `%s' er ikke understøttet"
 
-#: calendar/gui/e-tasks.c:414 calendar/gui/gnome-cal.c:1531
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Du har ikke rettigheder til at åbne mappen i \"%s\""
 
-#: calendar/gui/e-tasks.c:482 calendar/gui/gnome-cal.c:1735
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6004,7 +6111,7 @@ msgstr "Fjerner markerede objekter..."
 msgid "Expunging"
 msgstr "Udrenser"
 
-#: calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Ny _aftale..."
 
@@ -6045,12 +6152,12 @@ msgstr ""
 "%s\n"
 " er gået ned. Du skal genstarte Evolution for at kunne bruge den igen"
 
-#: calendar/gui/gnome-cal.c:1993
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Åbner kalender ved %s"
 
-#: calendar/gui/gnome-cal.c:2033
+#: calendar/gui/gnome-cal.c:2035
 msgid "Opening default tasks folder"
 msgstr "Åbner standardopgavemappen"
 
@@ -6110,296 +6217,173 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:344 calendar/gui/itip-utils.c:415
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr "En organisator skal angives."
 
-#: calendar/gui/itip-utils.c:379
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Mindst en deltager er nødvendig"
 
-#: calendar/gui/itip-utils.c:458 calendar/gui/itip-utils.c:567
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:460 calendar/gui/itip-utils.c:569
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "Journalinformation"
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:588
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "Ledig/optaget-information"
 
-#: calendar/gui/itip-utils.c:466
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Opdateret"
 
-#: calendar/gui/itip-utils.c:510
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Opdatér"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Modforslag"
 
-#: calendar/gui/itip-utils.c:582
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/optaget-information (%s til %s)"
 
-#: calendar/gui/itip-utils.c:594
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "iCalendar-information"
 
-#: calendar/gui/itip-utils.c:752
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i arrangementet"
 
-#: calendar/gui/print.c:454
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:454
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:454
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:454
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:454
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:455
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:455
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:455
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:455
-msgid "9th"
-msgstr "9."
-
-#: calendar/gui/print.c:455
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:456
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:456
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:456
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:456
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:456
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:457
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:457
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:457
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:457
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:457
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:458
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:458
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:458
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:458
-msgid "24th"
-msgstr "24."
-
-#: calendar/gui/print.c:458
-msgid "25th"
-msgstr "25."
-
-#: calendar/gui/print.c:459
-msgid "26th"
-msgstr "26."
-
-#: calendar/gui/print.c:459
-msgid "27th"
-msgstr "27."
-
-#: calendar/gui/print.c:459
-msgid "28th"
-msgstr "28."
-
-#: calendar/gui/print.c:459
-msgid "29th"
-msgstr "29."
-
-#: calendar/gui/print.c:459
-msgid "30th"
-msgstr "30."
-
-#: calendar/gui/print.c:460
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "Søn"
 
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Man"
 
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Tir"
 
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "Lør"
 
 #. Day
-#: calendar/gui/print.c:1861
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valgt dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1886 calendar/gui/print.c:1890
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1887
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1891 calendar/gui/print.c:1893
-#: calendar/gui/print.c:1894
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1898
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valgt uge (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1906
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Valgt måned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1913
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: calendar/gui/print.c:2247
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "Opgave"
 
-#: calendar/gui/print.c:2304
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2322
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2336
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Færdige procenter: %i"
 
-#: calendar/gui/print.c:2348
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2373
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2615
-#: calendar/gui/tasks-control.c:591 mail/mail-callbacks.c:2930
-#: my-evolution/e-summary.c:617
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "Forhåndsvisning af udskrift"
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Udskriv element"
 
-#: calendar/gui/print.c:2635
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Printeropsætning"
 
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til opgavemappen, der skal vises"
 
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:472
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6411,87 +6395,51 @@ msgstr ""
 "\n"
 "Vil du virkelig fjerne disse opgaver?"
 
-#: calendar/gui/tasks-control.c:469
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "Spørg mig ikke igen."
 
-#: calendar/gui/tasks-control.c:622
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr "Udskriv opgaver"
 
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-"Evolution har udført automatisk migration af opgaverne fra din kalendermappe "
-"til den nye opgave-mappe."
-
-#: calendar/gui/tasks-migrate.c:108
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-"Evolution har forsøgt at migrere opgaverne, som var i din kalendermappe, til "
-"den nye opgavemappe.\n"
-"Nogle af opgaverne kunne ikke migreres, så denne proces vil blive forsøgt "
-"igen i fremtiden."
-
-#: calendar/gui/tasks-migrate.c:120
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-"Kunne ikke åbne '%s'. Ingen elementer fra kalendermappen vil blive flyttet "
-"til opgavemappen."
-
-#: calendar/gui/tasks-migrate.c:133
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-"Metoden som kræves for at indlæse `%s' er ikke understøttet; ingen "
-"opføringer fra kalendermappen vil blive migreret til opgavemappen."
-
-#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:379
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Fabrik for import af iCalendar-filer til Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution kalender iTip/iMip-visning"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Importerer iCalendar-filer til Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Evolution kalender iTip/iMip-visning"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Importerer vCalendar-filer til Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Evolution kalender iTip/iMip-visning"
 
-#: calendar/importers/icalendar-importer.c:169
-#, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr "Kan ikke hente lagerliste fra register: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Kalenderbesked"
 
-#: calendar/importers/icalendar-importer.c:181
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Kan ikke kalde getFolderAtPath på lager: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
+msgstr ""
 
-#: calendar/importers/icalendar-importer.c:484
+#: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
 msgstr "Påmindelse!!"
 
-#: calendar/importers/icalendar-importer.c:698
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Kalenderhændelser"
 
-#: calendar/importers/icalendar-importer.c:723
+#: calendar/importers/icalendar-importer.c:663
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6499,10 +6447,14 @@ msgstr ""
 "Evolution har fundet Gnome-kalenderfiler.\n"
 "Vil du importere dem til Evolution?"
 
-#: calendar/importers/icalendar-importer.c:730
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Gnome-kalenderen"
 
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "tid-nu forventer 0 argumenter"
@@ -8169,11 +8121,11 @@ msgstr "Du kan ikke importere nøgler med dette cipher"
 msgid "You may not export keys with this cipher"
 msgstr "Du kan ikke eksportere nøgler med dette cipher"
 
-#: camel/camel-data-cache.c:137
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr "Kan ikke oprette cachesøgesti"
 
-#: camel/camel-data-cache.c:375
+#: camel/camel-data-cache.c:370
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kunne ikke fjerne cacheindgangen: %s: %s"
@@ -8213,84 +8165,91 @@ msgstr "Forbereder mappen \"%s\" til afkoblet tilstand"
 msgid "You must be working online to complete this operation"
 msgstr "Du skal arbejde opkoblet for at fuldføre denne operation"
 
-#: camel/camel-filter-driver.c:767 camel/camel-filter-driver.c:776
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
+#, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-process.c:92
+#, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Mislykkedes med at oprette barneprocessen \"%s\": %s"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Kunne ikke oprette hilsen fra %s: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:865 camel/camel-filter-driver.c:1238
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fejl under læsning af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:874 camel/camel-filter-driver.c:1244
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fejl under kørsel af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:941
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke åbne spool-mappen"
 
-#: camel/camel-filter-driver.c:950
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Kan ikke behandle spool-mappen"
 
-#: camel/camel-filter-driver.c:965
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter besked %d (%d%%)"
 
-#: camel/camel-filter-driver.c:969
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Kan ikke åbne besked"
 
-#: camel/camel-filter-driver.c:970 camel/camel-filter-driver.c:982
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Mislykkedes på besked %d"
 
-#: camel/camel-filter-driver.c:996 camel/camel-filter-driver.c:1090
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:1057
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: camel/camel-filter-driver.c:1072
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mislykkedes på besked %d af %d"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr "Meddelelsen kunne ikke hentes"
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ugyldige argumenter til (system-flag)"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ugyldige argumenter til (user-tag)"
 
-#: camel/camel-filter-search.c:514
-#, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
-
-#: camel/camel-filter-search.c:550
-#, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Mislykkedes med at oprette barneprocessen \"%s\": %s"
-
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fejl under udførelse af filtersøgning: %s: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8299,7 +8258,7 @@ msgstr ""
 "Kan ikke tolke søgeudtrykket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8308,11 +8267,11 @@ msgstr ""
 "Fejl under kørsel af søgeudtrykket %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) kræver et enkelt boolsk resultat"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Udfører forespørgsel på ukendt header: %s"
@@ -8368,9 +8327,9 @@ msgstr ""
 "Du skal bruge et gpg-løsen for at låse nøglen op\n"
 "for brugeren: \"%s\""
 
-#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1246
-#: camel/camel-gpg-context.c:1353 camel/camel-gpg-context.c:1428
-#: camel/camel-gpg-context.c:1485 mail/mail-send-recv.c:565
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr "Afbrudt."
 
@@ -8391,7 +8350,7 @@ msgstr "Ingen data givet"
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Mislykkedes med at kryptere: ingen gyldige modtagere angivet."
 
-#: camel/camel-gpg-context.c:1122
+#: camel/camel-gpg-context.c:1125
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8402,24 +8361,24 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1131
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Mislykkedes med at GPG'e %s: %s\n"
 
-#: camel/camel-gpg-context.c:1237 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1580
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg kunne ikke udføres: %s"
 
-#: camel/camel-gpg-context.c:1267 camel/camel-gpg-context.c:1345
-#: camel/camel-gpg-context.c:1419 camel/camel-gpg-context.c:1449
-#: camel/camel-gpg-context.c:1476 camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
 msgid "Failed to execute gpg."
 msgstr "gpg kunne ikke udføres."
 
-#: camel/camel-gpg-context.c:1330
+#: camel/camel-gpg-context.c:1333
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8531,11 +8490,11 @@ msgstr "Kunne ikke dekryptere MIME-del: ugyldig struktur"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Kunne ikke dekryptere MIME-del: tolkningsfejl"
 
-#: camel/camel-multipart-signed.c:625
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt underskrevet brevdel"
 
-#: camel/camel-multipart-signed.c:679
+#: camel/camel-multipart-signed.c:682
 msgid "parse error"
 msgstr "tolkningsfejl"
 
@@ -8606,11 +8565,11 @@ msgstr ""
 "Dette alternativ kobler til serveren med brug af CRAM-MD5-adgangskode, hvis "
 "serveren understøtter det."
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8618,113 +8577,117 @@ msgstr ""
 "Dette alternativ kobler til serveren med brug af DIGEST-MD5-adgangskode, "
 "hvis serveren understøtter det."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Udfordring fra server for lang (>2048 oktetter)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Ugyldig udfordring fra server\n"
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 "Udfordring fra server indeholdt ugyldig tegn for \"Kvalitet for beskyttelse"
 "\"\n"
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr "Svar fra server indeholdt ikke godkendelsessdata\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Svar fra server indeholdt ufuldstændige godkendelsesdata\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "Svar fra server er ikke det samme\n"
 
-#: camel/camel-sasl-gssapi.c:36
+#: camel/camel-sasl-gssapi.c:48
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: camel/camel-sasl-gssapi.c:38
+#: camel/camel-sasl-gssapi.c:50
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "Dette valg gør brug af Kerberos 5 godkendelse ved opkobling til serveren."
 
-#: camel/camel-sasl-gssapi.c:129
+#: camel/camel-sasl-gssapi.c:148
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:134
+#: camel/camel-sasl-gssapi.c:153
 msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:137
+#: camel/camel-sasl-gssapi.c:156
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:141
+#: camel/camel-sasl-gssapi.c:160
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:146
+#: camel/camel-sasl-gssapi.c:165
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:150
+#: camel/camel-sasl-gssapi.c:169
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:155
-msgid ""
-"Indicates that the supplied context handle did not refer to a valid context."
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:159
-msgid "Indicates that consistency checks performed on the input_token failed."
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:163
+#: camel/camel-sasl-gssapi.c:180
 msgid "The consistency checks performed on the credential failed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:166
+#: camel/camel-sasl-gssapi.c:183
 msgid "The referenced credentials have expired."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:173 camel/camel-sasl-gssapi.c:218
-#: camel/camel-sasl-gssapi.c:253 camel/camel-sasl-gssapi.c:269
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1049
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
 msgid "Bad authentication response from server."
 msgstr "Ugyldigt svar på autenticering fra server."
 
-#: camel/camel-sasl-gssapi.c:277
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
+
+#: camel/camel-sasl-gssapi.c:299
 msgid "Unsupported security layer."
 msgstr "Et ikke-understøttet sikkerhedslag."
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Dette valg gør brug af Kerberos 4 godkendelse ved opkobling til serveren."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8780,7 +8743,7 @@ msgstr "POP før SMTP-godkendelse via en ukendt transport"
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP før SMTP-godkendelse via ikke-pop kilde"
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Oversættelse af regulært udtryk mislykkedes: %s: %s"
@@ -8805,30 +8768,30 @@ msgstr "URL '%s' skal indeholde en sti"
 msgid "Resolving: %s"
 msgstr "Finder: \"%s\""
 
-#: camel/camel-service.c:773 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fejl i navneopslag: %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Værtsopslag mislykkedes: %s: vært ikke fundet"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Værtsopslag mislykkedes: %s: ukendt årsag"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 msgid "Resolving address"
 msgstr "Slår adresse op"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr "Opslag af værtsnavn mislykkedes: vært kunne ikke findes"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr "Opslag af værtsnavn mislykkedes: ukendt årsag"
 
@@ -8899,123 +8862,123 @@ msgstr "Kan ikke finde mappe: Ugyldig operation på dette lager"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke oprette mappe: Ugyldig operation på dette lager"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr "Kan ikke hente udstederens certifikat."
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr "Kan ikke hente certifikattilbagetrækningsliste"
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr "Kan ikke dekryptere certifikatsignatur"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "Kan ikke dekryptera signatur for certifikattilbagetrækningsliste"
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr "Kan ikke afkode udsteders offentlige nøgle"
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr "Certifikatsignaturfejl"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr "Signaturfejl i certifikattilbagetrækningslisten"
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr "Certifikatet er ikke gyldigt endnu"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Certifikatet er udløbet"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr "CRL er ikke gyldig endnu"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr "CRL er udløbet"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr "Fejl i CRL"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Løbet tør for hukommelse"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr "Nuldybde selvsigneret certifikat"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr "Selvsigneret certifikat i kæden"
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr "Kan ikke finde udsteders certifikat lokalt"
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr "Kan ikke verificere bladsignatur"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr "Certifikatkæden er for lang"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr "Certifikat tilbagekaldt"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Ugyldig certifikatmyndighed (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr "Søgestiens længde overskredet"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr "Ugyldigt formål"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr "Certifikat utroværdigt"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr "Certifikat afvist"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr "Emne/Udsteder stemmer ikke overens"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr "AKID/SKID stemmer ikke overens"
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr "AKID/Udsteder-serienummer stemmer ikke overens"
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr "Nøgleanvendelse understøtter ikke certifikatsignering"
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr "Fejl i programverifikation"
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:806
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9028,15 +8991,15 @@ msgstr ""
 "Fingeraftryk:      %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:812
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "GOD"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:812
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "DÅRLIG"
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9056,7 +9019,7 @@ msgstr ""
 "Vil du acceptere alligevel?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:816
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9071,7 +9034,7 @@ msgstr ""
 "\n"
 "Vil du acceptere?"
 
-#: camel/camel-tcp-stream-ssl.c:860
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9080,7 +9043,7 @@ msgstr ""
 "Certifikatproblem: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:912
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9089,7 +9052,7 @@ msgstr ""
 "Fejlagtigt certifikatdomæne: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:930
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9098,7 +9061,7 @@ msgstr ""
 "Certifikatet er udløbet: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9107,7 +9070,7 @@ msgstr ""
 "Certifikattilbagekaldelseslisten er udløbet: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Kunne ikke tolke URL `%s'"
@@ -9122,39 +9085,39 @@ msgstr "Fejl ved lagring af \"%s\": %s"
 msgid "No such message %s in %s"
 msgstr "Ingen sådan besked %s i %s"
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meddelelser til en virtuel mappe"
 
-#: camel/camel-vee-store.c:272
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
 
-#: camel/camel-vee-store.c:291
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
 
-#: camel/camel-vee-store.c:304
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
 
-#: camel/camel-vee-store.c:312
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke ændre navn på mappe: %s: Ingen sådan mappe"
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:452
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "Operation afbrudt"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server koblet fra uventet: %s"
@@ -9179,16 +9142,16 @@ msgstr "Uventet svar fra IMAP-server: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/imap/camel-imap-command.c:462
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "Svar fra server blev afsluttet for tidligt."
 
-#: camel/providers/imap/camel-imap-command.c:654
+#: camel/providers/imap/camel-imap-command.c:655
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Svar fra IMAP-server indeholdt ikke %s-information"
 
-#: camel/providers/imap/camel-imap-command.c:690
+#: camel/providers/imap/camel-imap-command.c:691
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet 'OK'-svar fra IMAP-server: %s"
@@ -9280,7 +9243,7 @@ msgstr "Ser efter nye beskeder"
 msgid "Check for new messages in all folders"
 msgstr "Se efter nye beskeder i alle mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1135
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "Mapper"
 
@@ -9310,7 +9273,7 @@ msgstr "For læsning og lagring af e-post på IMAP-servere."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Adgangskode"
 
@@ -9330,58 +9293,57 @@ msgstr "IMAP-server %s"
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjeneste for %s på %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr "Tilkobling afbrudt"
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Kunne ikke tilslutte IMAP-servern %s i sikker tilstand: %s"
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS-udvidelsen understøttes ikke."
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandlinger mislykkedes"
 
-#: camel/providers/imap/camel-imap-store.c:1072
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-server %s understøtter ikke efterspurgt autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1082
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen understøtte for autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1106
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIndtast venligst IMAP-adgangskode for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1121
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9392,24 +9354,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1495
-#: camel/providers/imap/camel-imap-store.c:1637
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1838
+#: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Mappnavnet \"%s\" er ugyldigt eftersom det indeholder tegnet \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1850
+#: camel/providers/imap/camel-imap-store.c:1851
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukendt forældermappe: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1886
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ophavsmappen tillades ikke at have undermapper"
 
@@ -9487,7 +9449,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrod %s er ikke en absolut sti"
@@ -9513,7 +9475,7 @@ msgstr "Lokalt lager har ikke en indbakke"
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:904
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
@@ -9558,7 +9520,7 @@ msgstr "Ugyldig beskedsindhold"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9570,14 +9532,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:169
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9603,8 +9565,8 @@ msgid "not a maildir directory"
 msgstr "ikke et maildir katalog"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:283
-#: camel/providers/local/camel-spool-store.c:313
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikke søge i mappe `%s': %s"
@@ -9624,10 +9586,10 @@ msgid "Checking for new messages"
 msgstr "Checker for nye meddelelser"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:679
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Gemmer mappe"
 
@@ -9709,75 +9671,75 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen `%s' er ikke tom. Ikke slettet."
 
-#: camel/providers/local/camel-mbox-summary.c:351
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunne ikke åbne mappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:399
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatal fejl i læsning af postboksen nær position %ld i mappe %s"
 
-#: camel/providers/local/camel-mbox-summary.c:455
+#: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikke tjekke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:593
-#: camel/providers/local/camel-mbox-summary.c:684
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunne ikke åbne fil %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:605
-#: camel/providers/local/camel-spool-summary.c:170
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke åbne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:618
-#: camel/providers/local/camel-mbox-summary.c:780
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:627
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:638
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke ændre navn på mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:722
-#: camel/providers/local/camel-mbox-summary.c:730
-#: camel/providers/local/camel-mbox-summary.c:921
-#: camel/providers/local/camel-mbox-summary.c:929
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Fejl i sammendrag og mappe, selv efter synkronisering"
 
-#: camel/providers/local/camel-mbox-summary.c:855
-#: camel/providers/local/camel-spool-summary.c:342
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukendt fejl: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:890
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunne ikke gemme mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:984
-#: camel/providers/local/camel-mbox-summary.c:1010
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fejl under skriving til midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks mislykkedes: %s: %s"
@@ -9801,63 +9763,63 @@ msgstr "`%s' er ikke et katalog."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikke åbne MH-katalogsti: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Køen \"%s\" kan ikke åbnes: %s"
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Køen \"%s\" er ingen almindelig fil eller katalog"
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen `%s/%s' eksisterer ikke."
 
-#: camel/providers/local/camel-spool-store.c:177
+#: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "\"%s\" er ingen postkassefil."
 
-#: camel/providers/local/camel-spool-store.c:194
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr "Lagret understøtter ikke en INDBAKKE"
 
-#: camel/providers/local/camel-spool-store.c:206
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool e-post-fil %s"
 
-#: camel/providers/local/camel-spool-store.c:206
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Kø-mapptræ %s"
 
-#: camel/providers/local/camel-spool-store.c:214
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mapper kan ikke omdøbes"
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmapper kan ikke blive slettet"
 
-#: camel/providers/local/camel-spool-summary.c:183
-#: camel/providers/local/camel-spool-summary.c:193
-#: camel/providers/local/camel-spool-summary.c:203
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Kunne ikke synkronisere midlertidig mappe %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:219
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kunne ikke synkronisere spool-mappe %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:250
-#: camel/providers/local/camel-spool-summary.c:269
-#: camel/providers/local/camel-spool-summary.c:282
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -9991,7 +9953,7 @@ msgstr "Behold beskeder på serveren"
 msgid "Delete after %s day(s)"
 msgstr "Slet efter %s dage"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -10018,25 +9980,25 @@ msgstr ""
 "adgangskode via APOP-protokollen. Dette vil måske ikke virke for alle "
 "brugere selv på servere som hævder at understøtte det."
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Kunne ikke tilslutte POP-serveren %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Kunne ikke tilslutte POP-servern %s i sikker tilstand: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Kunne ikke tilslutte POP-servern %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10045,28 +10007,28 @@ msgstr ""
 "Kan ikke tilslutte POP-servern %s: Ingen understøttelse for ønskede "
 "godkendelsesmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL \"%s\"-godkendelse mislykkedes for POP-serveren %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Kan ikke logge ind i POP-servern %s: SASL-protokollfejl"
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Godkendelse mislykkedes på POP-serveren %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sAngiv POP-adgangskoden for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:523
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10075,13 +10037,13 @@ msgstr ""
 "Kan ikke tilslutte POP-serveren %s.\n"
 "Fejl ved afsendelse af adgangskode: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:615
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen sådan mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10093,49 +10055,49 @@ msgstr ""
 "For levering af e-post ved at videresende den til \"sendmail\"-programmet på "
 "det lokale system."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Kunne ikke tolke modtagerlisten"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kunne ikke oprette kanal til sendmail: %s: besked ikke sendt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kunne ikke køre fork på sendmail: %s: besked ikke sendt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kunne ikke sende beskeden: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail afsluttet med signal %s: besked ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Kunne ikke køre %s: besked ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail afsluttet med status %d: besked ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering af e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10143,135 +10105,135 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "For levering af e-post via en ekstern e-postserver med SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfejl, kommando ikke genkendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfejl i parametre eller argumenter"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Kommando ikke implementeret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementeret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar på systemhjælp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Hjælpebesked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Tjeneste klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Tjenesten lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Tjenesten er ikke tilgængelig, lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Forespurgt e-post handling er ok, fuldført"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr "Ikke lokal bruger; videresender til <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Forespurgt e-post-handling er ikke udført: postboks ikke tilgængelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurgt handling ikke udført: postboks ikke tilgængelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurgt handling afbrudt: fejl i processering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr "Ikke lokal bruger; venligst prøv <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Forespurgt handling ikke udført: utilstrækkelig lagringsplads"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Forespurgt e-post handling afbrudt: lagringsallokering overskredet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Forespurgt handling ikke udført: postboksnavn ikke tilladt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start e-post input; slut med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "Transaktionen mislykkedes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "Adgangskodeoverføring kræves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Autenticeringsmekanismen er for svag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kræves for forespurgt autenticeringsmekanisme."
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autenticeringsfejl"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Autenticering kræves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr "Fejl i velkomstsvar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Tilslutning til SMTP-servern %s mislykkedes i sikkert tilstand: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:342
 msgid "server does not appear to support SSL"
 msgstr "serveren ser ikke ud til at understøtte SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "STARTTLS-forespørgslen gav time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr "Fejl i STARTTLS-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-serveren %s understøtter ikke den ønskede godkendelsestype %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIndtast venligst SMTP-adgangskode for %s@%s"
@@ -10313,61 +10275,61 @@ msgstr "Kan ikke sende besked: ingen modtagere definerte."
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan ikke sende meddelelse: en eller flere ugyldige modtagere"
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "HELO-forespørgsel gav time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "HELO response error"
 msgstr "Fejl i HELO-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "SMTP-autenticering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Fejl under opretelse af SASL-autenticeringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsafbrud for AUTH-forespørgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "AUTH-forespørgsel mislykkedes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar på autenticering fra server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for \"MAIL FROM\"-forespørgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr "Fejl i MAIL FROM-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for \"RCPT TO\"-forespørgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> mislykkedes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-forespørgsel: %s: besked ikke sendt."
@@ -10375,35 +10337,35 @@ msgstr "Tidsafbrud for DATA-forespørgsel: %s: besked ikke sendt."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 msgid "DATA response error"
 msgstr "Fejl i DATA-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-send: beskedsterminering: %s: besked ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr "Fejl i DATA-termineringssvar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsafbrud for RSET-forespørgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr "Fejl i RSET-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "QUIT-forespørgslen gav time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr "Fejl i QUIT-svar"
 
@@ -10423,19 +10385,19 @@ msgid "%.0fG"
 msgstr "%.0f G"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:364 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "bilag"
 
-#: composer/e-msg-composer-attachment-bar.c:505
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte opføringer fra bilagslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:535
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Tilføj bilag..."
 
-#: composer/e-msg-composer-attachment-bar.c:536
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Vedlæg en fil til beskeden"
 
@@ -10463,15 +10425,15 @@ msgid "MIME type:"
 msgstr "MIME-type:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:67
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning af bilag"
 
-#: composer/e-msg-composer-hdrs.c:287
+#: composer/e-msg-composer-hdrs.c:289
 msgid "Hey you, dunce. You need an account to send mail doncha know."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:478
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr "Klik her for at få adressebogen op"
 
@@ -10489,38 +10451,38 @@ msgstr "Svar-til:"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:521
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:527
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:541
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Indtast modtagerene for beskeden"
 
-#: composer/e-msg-composer-hdrs.c:545
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:546
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Indtast adresserne som skal modtage en kopi af beskeden"
 
-#: composer/e-msg-composer-hdrs.c:549
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10531,24 +10493,24 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:557
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Send til:"
 
-#: composer/e-msg-composer-hdrs.c:559
+#: composer/e-msg-composer-hdrs.c:549
 msgid "Posting destination"
 msgstr "Postdestination"
 
-#: composer/e-msg-composer-select-file.c:103
-#: composer/e-msg-composer-select-file.c:120
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Vedhæft fil(er)"
 
-#: composer/e-msg-composer.c:523
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "Kunne ikke oprette et PGP-signaturkontekst"
 
-#: composer/e-msg-composer.c:802
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10557,30 +10519,30 @@ msgstr ""
 "Fejl under læsning af fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1165
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:1183
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fejl under gemning af fil: %s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl under indlæsning af fil: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fejl ved adgang til fil: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente besked fra redigering"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10589,7 +10551,7 @@ msgstr ""
 "Kunne ikke søge i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10598,7 +10560,7 @@ msgstr ""
 "Kunne ikke afkorte fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1285
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10607,7 +10569,7 @@ msgstr ""
 "Kan ikke kopiere filhandtag: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10616,7 +10578,7 @@ msgstr ""
 "Fejl under autogemning af besked: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1376
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10624,7 +10586,7 @@ msgstr ""
 "Ximian Evolution har fundet ikke-gemte filer fra en tidligere session.\n"
 "Vil du prøve at genoprette dem?"
 
-#: composer/e-msg-composer.c:1538
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10635,31 +10597,32 @@ msgstr ""
 "\n"
 "Vil du gemme dine ændringar?"
 
-#: composer/e-msg-composer.c:1543
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Forkast ændringer"
 
-#: composer/e-msg-composer.c:1547
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Ændret besked"
 
-#: composer/e-msg-composer.c:1579
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Åbn fil"
 
-#: composer/e-msg-composer.c:1937
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:1977 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr "Automatisk genereret"
 
-#: composer/e-msg-composer.c:2156 composer/e-msg-composer.c:2746
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "Skriv en besked"
 
-#: composer/e-msg-composer.c:2777
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10667,7 +10630,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "adressse-udvælgelses-kontrol kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:2803
+#: composer/e-msg-composer.c:2931
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10679,7 +10642,7 @@ msgstr ""
 "Verficér at du har de rette versioner af\n"
 "gtkhtml og libgtkhtml installeret.\n"
 
-#: composer/e-msg-composer.c:2863
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10687,7 +10650,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "En komponent i HTML tekstbehandler kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:3872
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10695,18 +10658,6 @@ msgstr ""
 "<b>(Redigeringsværktøjet indeholder et meddelelse som ikke er text og som "
 "ikke kan redigeres.)<b>"
 
-#: composer/evolution-composer.c:417
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"Kunne ikke oprette skrivevindue fordi du ikke har sat\n"
-"en identitet op i e-post-komponenten."
-
-#: composer/evolution-composer.c:432
-msgid "Cannot initialize the Evolution composer."
-msgstr "Kan ikke initialisere Evolution-redigeringsværktøjet."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Gruppevaresuiten Evolution"
@@ -10817,9 +10768,8 @@ msgid ""
 "a receipt from you.</small>"
 msgstr ""
 "<small>Denne side lader dig vælge om du ønsker at blive underrettet med en "
-"læsningskvittering, når en besked som du har sendt bliver læst, "
-"og at angive hvad Evolution bør gøre når nogen anmoder om en "
-"kvittering fra dig.</small>"
+"læsningskvittering, når en besked som du har sendt bliver læst, og at angive "
+"hvad Evolution bør gøre når nogen anmoder om en kvittering fra dig.</small>"
 
 #: designs/read_receipts/read.glade.h:6
 msgid "Always send back a read reciept"
@@ -10843,7 +10793,8 @@ msgstr "Anmod om en læsningskvittering for alle beskeder jeg sender"
 
 #: designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "med mindre beskeden sendes til en posyliste, og ikke til mig personligt"
+msgstr ""
+"med mindre beskeden sendes til en posyliste, og ikke til mig personligt"
 
 #: designs/read_receipts/read.glade.h:12
 msgid ""
@@ -10859,7 +10810,7 @@ msgid ""
 msgstr ""
 "ping_timeout_callback: kunne ikke afgøra om CORBA-objektet er nil eller ej"
 
-#: e-util/e-dialog-utils.c:230
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10867,11 +10818,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: e-util/e-passwords.c:344
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Overskriv fil?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Husk denne adgangskode"
 
-#: e-util/e-passwords.c:346
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Husk denne adgangskode for resten af denne session"
 
@@ -10954,13 +10909,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
-#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
-#: widgets/misc/e-dateedit.c:1424 widgets/misc/e-dateedit.c:1637
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10969,42 +10924,74 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%H"
 
-#: filter/filter-datespec.c:65 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:180
-msgid "seconds"
-msgstr " sekunder"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 sekund"
+
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d sekunder"
 
 #: filter/filter-datespec.c:66
-msgid "minute"
-msgstr "minut"
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 minut"
+
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d minutter"
+
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 time"
 
 #: filter/filter-datespec.c:67
-msgid "hour"
-msgstr "time"
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d timer"
+
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 dag"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr "%d %s siden"
 
 #: filter/filter-datespec.c:69
-msgid "week"
-msgstr "uge"
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 uge"
 
-#: filter/filter-datespec.c:69 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "uger"
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d uger"
 
 #: filter/filter-datespec.c:70
-msgid "month"
+#, fuzzy
+msgid "1 month ago"
 msgstr "måned"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:23
-msgid "months"
-msgstr "måneder"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr "%d %s siden"
 
 #: filter/filter-datespec.c:71
-msgid "year"
-msgstr "år"
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:71 filter/filter.glade.h:33
-msgid "years"
-msgstr "år"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr "%d %s siden"
 
 #: filter/filter-datespec.c:176
 msgid "You must choose a date."
@@ -11023,17 +11010,11 @@ msgstr "nu"
 msgid "%d-%b-%Y"
 msgstr "%d %b %Y"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:298 filter/filter-datespec.c:301
-#, c-format
-msgid "%d %s ago"
-msgstr "%d %s siden"
-
-#: filter/filter-datespec.c:417
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Vælg en tid at sammenligne med"
 
-#: filter/filter-editor.c:115 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filterregler"
 
@@ -11046,7 +11027,7 @@ msgstr "Du skal angive et filnavn."
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Filen \"%s\" findes ikke eller er ingen almindelig fil."
 
-#: filter/filter-file.c:293
+#: filter/filter-file.c:298
 msgid "Choose a file"
 msgstr "Vælg en fil"
 
@@ -11055,12 +11036,12 @@ msgstr "Vælg en fil"
 msgid "Then"
 msgstr "Så"
 
-#: filter/filter-folder.c:153
+#: filter/filter-folder.c:155
 msgid "You must specify a folder."
 msgstr "Du skal angive en mappe."
 
-#: filter/filter-folder.c:241 filter/vfolder-rule.c:406
-#: mail/mail-account-gui.c:1475 mail/mail-account-gui.c:1489
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "Vælg mappe"
 
@@ -11073,34 +11054,36 @@ msgstr ""
 "Fejl i regulært udtryk '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:68
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
 msgid "Important"
 msgstr "Vigtig"
 
 #. red
 #: filter/filter-label.c:122 mail/mail-config.c:69
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 msgid "Work"
 msgstr "Arbejde"
 
 #. orange
-#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1281
 msgid "Personal"
 msgstr "Personligt"
 
 #. forest green
 #: filter/filter-label.c:124 mail/mail-config.c:71
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 msgid "To Do"
 msgstr "At-gøre"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:67
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1283
 msgid "Later"
 msgstr "Senere"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:62
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 msgid "Test"
 msgstr "Test"
 
@@ -11185,7 +11168,7 @@ msgstr ""
 "Meddelelsedatoen vil blive sammenlignet med\n"
 "den aktuelle tiden når filtreringen kørs."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:115
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Virtuelle mapper"
 
@@ -11197,6 +11180,14 @@ msgstr "en tid relativ til tiden nu"
 msgid "ago"
 msgstr "siden"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "måneder"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr " sekunder"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "kun specifikke mapper"
@@ -11213,6 +11204,10 @@ msgstr "den tid du angiver"
 msgid "vFolder Sources"
 msgstr "vFolder kilder"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "uger"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "med alle aktive eksterne mapper"
@@ -11225,6 +11220,10 @@ msgstr "med alle lokale og aktive eksterne mapper"
 msgid "with all local folders"
 msgstr "med alle lokale mapper"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "år"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11247,225 +11246,226 @@ msgid "Beep"
 msgstr "Bip"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "indeholder"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dato modtaget"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Slettet"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "indeholder ikke"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "slutter ikke med"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "eksisterer ikke"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not return"
+msgstr "returnerer ikke"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "ligner ikke"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "starter ikke med"
+
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Eksisterer ikke"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Skitse"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "slutter med"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Eksisterer"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "eksisterer"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Udtryk"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Følg op"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1778
+#: filter/libfilter-i18n.h:27
+msgid "is"
+msgstr "er"
+
+#: filter/libfilter-i18n.h:28
+msgid "is after"
+msgstr "er efter"
+
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "er inden"
+
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr "er markeret med flag"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "er større end"
+
+#: filter/libfilter-i18n.h:32
+msgid "is less than"
+msgstr "er mindre end"
+
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "er ikke"
+
+#: filter/libfilter-i18n.h:34
+msgid "is not Flagged"
+msgstr "er ikke markeret med flag"
+
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 msgid "Label"
 msgstr "Etiket"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Beskedskrop"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Beskedshoved"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Flyt til mappe"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 msgid "Pipe Message to Shell Command"
 msgstr "Send meddelelse igennem skalkommando"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Afspil lyd"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr "Læs"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Modtagere"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Træffer på regulært udtryk"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Svaret til"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:46
+msgid "returns"
+msgstr "returnerer"
+
+#: filter/libfilter-i18n.h:47
+msgid "returns greater than"
+msgstr "returnerer større end"
+
+#: filter/libfilter-i18n.h:48
+msgid "returns less than"
+msgstr "returnerer mindre end"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Point"
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1812
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Afsender"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Sæt status"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:52
 msgid "Shell Command"
 msgstr "Skalkommando"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Størrelse (kB)"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "lyder som"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Specifik header"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "starter med"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:906
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
 #: mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:61
 msgid "Unset Status"
 msgstr "Neutraliser status"
 
-#: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "indeholder"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "indeholder ikke"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "slutter ikke med"
-
-#: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "eksisterer ikke"
-
-#: filter/libfilter-i18n.h:44
-msgid "does not return"
-msgstr "returnerer ikke"
-
-#: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "ligner ikke"
-
-#: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "starter ikke med"
-
-#: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "slutter med"
-
-#: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "eksisterer"
-
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "er markeret med flag"
-
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "er efter"
-
-#: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "er inden"
-
-#: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "er større end"
-
-#: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "er mindre end"
-
-#: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "er ikke markeret med flag"
-
-#: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "er ikke"
-
-#: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:57
-msgid "returns greater than"
-msgstr "returnerer større end"
-
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
-msgstr "returnerer mindre end"
-
-#: filter/libfilter-i18n.h:59
-msgid "returns"
-msgstr "returnerer"
-
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "lyder som"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "starter med"
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
+#, c-format
+msgid "Rule name '%s' is not unique, choose another."
+msgstr "Regelnavnet \"%s\" er ikke unikt, vælg et andet."
 
 #: filter/rule-editor.c:170
 msgid "Rules"
 msgstr "Regler"
 
-#: filter/rule-editor.c:241 filter/rule-editor.c:325
-#, c-format
-msgid "Rule name '%s' is not unique, choose another."
-msgstr "Regelnavnet \"%s\" er ikke unikt, vælg et andet."
-
 #: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Tilføj regel"
@@ -11482,11 +11482,11 @@ msgstr "Regelnavn"
 msgid "Score Rules"
 msgstr "Pointregler"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "Du skal give navn til denne vfolder."
 
-#: filter/vfolder-rule.c:220
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du skal specificere mindst en mappe som kilde."
 
@@ -11494,39 +11494,44 @@ msgstr "Du skal specificere mindst en mappe som kilde."
 msgid "VFolder source"
 msgstr "Kilde for virtuel mappe"
 
-#: importers/elm-importer.c:95
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gammel e-post fra Elm"
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr "Importerer..."
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr "Venligst vent"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importerer %s som %s"
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, c-format
 msgid "Scanning %s"
 msgstr "Søger i %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:113
-#: mail/folder-browser-ui.c:357
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
 msgstr "Post"
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11534,7 +11539,7 @@ msgstr ""
 "Evolution har fundet Elm e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11546,12 +11551,12 @@ msgstr ""
 "Evolution har fundet GnomeCard filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetsfilter \"%s\""
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11577,7 +11582,7 @@ msgstr ""
 "Kontroller de importerede filtre for at sikre dig at\n"
 "alting stadigvæk fungerer som tiltænkt."
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11589,7 +11594,7 @@ msgstr ""
 "tråd\", som ikke understøttes i Evolution.\n"
 "Disse filtre vil blive forkastet."
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11603,37 +11608,39 @@ msgstr ""
 "ændredes til at teste hvorvidt strengen findes\n"
 "eller ikke findes i meddelelseteksten."
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1092
-#: shell/e-local-storage.c:184
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Affald"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Gennemsøger e-postfiltre"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr "Søger i katalog"
 
-#: importers/netscape-importer.c:2047 shell/e-shell-startup-wizard.c:647
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Starter import"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr "E-postfiltre"
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11641,11 +11648,11 @@ msgstr ""
 "Evolution har fundet Netscape e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importerer gammel e-post fra Pine"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -11653,7 +11660,7 @@ msgstr ""
 "Evolution har fundet Pine e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
@@ -11662,59 +11669,68 @@ msgid "Composer Preferences"
 msgstr "Redigererindstillinger"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Konfigurationsværktøj for Evolutions visningsskrifttyper."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Konfigurationsværktøj for Evolutions e-postkonti."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Konfigurationsværktøj for Evolutions e-postkomponent."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Konfigurationsværktøj for Evolutions meddelelsesredigeringsværktøj."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Konfigurér e-postindstillinger, inklusive sikkerhed og meddelelsesvisning, "
 "hér"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Konfigurér stavekontrol, signaturer, og meddelelseredigeringen hér"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure the fonts used by Evolution here"
 msgstr "Konfigurér de skrifttyper Evolution anvender her"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr "Konfigurér dine e-postkonti her"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Kontoredigering for Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolutions e-postredigering."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolutions e-postredigering."
+
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Evolution komponent for håndtering af e-post."
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutions e-postredigering."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Evolutions e-postredigering."
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Grænseflade for e-post-konfiguration"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Evolution e-post komponent for sammendrag."
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution-komponent for e-post mappevisning."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Evolution-komponent for e-post mappevisning."
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Evolution komponent for e-postmappe fabrik."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr "Fabrik for kontrollerne som eksporteres af Evolution-epostkomponenten"
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-post komponent for sammendrag."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
@@ -11724,47 +11740,43 @@ msgstr "Skrifttypeindstillinger"
 msgid "Mail Accounts"
 msgstr "E-postkonti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr "E-postindstillinger"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "Grænseflade for e-post-konfiguration"
-
-#: mail/component-factory.c:113
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Mappe som indeholder e-post"
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Offentlig post"
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Offentlig mappe som indeholder e-post"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Virtuelt affald"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Virtuel affaldsmappe"
 
-#: mail/component-factory.c:143
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Denne mappe kan ikke indeholde beskeder."
 
-#: mail/component-factory.c:437
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Egenskaber ..."
 
-#: mail/component-factory.c:437
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Ændr denne mappes egenskaber"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11772,68 +11784,56 @@ msgstr ""
 "Nogen af dine indstillinger for e-post ser ud til at være beskadiget. "
 "Venligst tjek at alt er i orden."
 
-#: mail/component-factory.c:988
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke sat en transportmetode for e-post"
 
-#: mail/component-factory.c:1012
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meddelelser, vil du afslutte alligevel?"
 
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Ny e-post besked"
 
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "Send _besked"
 
-#: mail/component-factory.c:1053
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmeddelelse"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1069
 msgid "New Message Post"
 msgstr "Postning af ny meddelelse"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr "_Post meddelelse"
 
-#: mail/component-factory.c:1062
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "Post en ny e-postmeddelelse"
 
-#: mail/component-factory.c:1090
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Kan ikke initialisere Evolutions e-postkomponent."
-
-#: mail/component-factory.c:1099
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Kan ikke initiere Evolutions konfigurationskomponent for e-post."
-
-#: mail/component-factory.c:1105
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
-
-#: mail/component-factory.c:1349 mail/component-factory.c:1379
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "Tilslutter..."
 
-#: mail/component-factory.c:1390
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring med skallen"
 
-#: mail/folder-browser-ui.c:484
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaber for \"%s\""
 
-#: mail/folder-browser-ui.c:486
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: mail/folder-browser.c:327 mail/mail-display.c:388 mail/mail-display.c:907
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke oprette midlertidigt katalog: %s"
@@ -11878,129 +11878,129 @@ msgstr "%d sendte"
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1167
+#: mail/folder-browser.c:1182
 msgid "Create _Virtual Folder From Search..."
 msgstr "Opret _virtuel mappe fra søgning..."
 
-#: mail/folder-browser.c:1714
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "Virtuel mappe for e_mnet"
 
-#: mail/folder-browser.c:1715
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "Virtuel mappe for afse_nder"
 
-#: mail/folder-browser.c:1716
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "Virtuel mappe for modtage_re"
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "Virtuel mappe på e-post_liste"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på em_ne"
 
-#: mail/folder-browser.c:1722
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Filtrér på afsen_der"
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Filtrér på modta_gere"
 
-#: mail/folder-browser.c:1724 mail/folder-browser.c:2048
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr "Filtrér på e-_postliste"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "R_edigér som ny besked..."
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "S_kriv ud"
 
-#: mail/folder-browser.c:1748 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1750 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1755
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr "Føl_g op..."
 
-#: mail/folder-browser.c:1756
+#: mail/folder-browser.c:1771
 msgid "Fla_g Completed"
 msgstr "Marker færdi_ge med flag"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1772
 msgid "Cl_ear Flag"
 msgstr "Neutralis_er flag"
 
 #. separator here?
-#: mail/folder-browser.c:1761 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_kér som læst"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr "Marker som _ulæst"
 
-#: mail/folder-browser.c:1763
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Markér som v_igtig"
 
-#: mail/folder-browser.c:1764
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr "Markér som uvi_gtig"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1784
 msgid "U_ndelete"
 msgstr "_Fortryd sletning"
 
-#: mail/folder-browser.c:1773
+#: mail/folder-browser.c:1788
 msgid "Mo_ve to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: mail/folder-browser.c:1774 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opiér til mappe..."
 
-#: mail/folder-browser.c:1782
+#: mail/folder-browser.c:1797
 msgid "Add Sender to Address_book"
 msgstr "Tilføj afsenderen til adresse_bogen"
 
-#: mail/folder-browser.c:1786
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr "Anvend filtre"
 
-#: mail/folder-browser.c:1790
+#: mail/folder-browser.c:1805
 msgid "Crea_te Rule From Message"
 msgstr "Ska_b regel fra meddelelse"
 
-#: mail/folder-browser.c:2049
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr "Virtuele mappe på postliste"
 
-#: mail/folder-browser.c:2051
+#: mail/folder-browser.c:2066
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtre på postliste (%s)"
 
-#: mail/folder-browser.c:2052
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Virtuel mappe på postliste (%s)"
@@ -12013,21 +12013,37 @@ msgstr "Standard"
 msgid "Getting Folder Information"
 msgstr "Henter mappeinformation"
 
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolutions e-postredigering."
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Fabrik for at importere mbox til Evolution"
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolutions e-postredigering."
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importerer mbox-filer til Evolution"
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolutions e-postredigering."
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Fabrik for at importere Outlook Express 4-beskeder til Evolution"
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importerer Outlook Express 4-filer til Evolution"
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolutions e-postredigering."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12072,55 +12088,55 @@ msgstr "Du har ikke udfyldt al nødvendig information."
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Vært:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:126
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Bruger_navn:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-account-gui.c:1851
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke oprette to konti med samme navn."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil slette denne konto?"
 
-#: mail/mail-accounts.c:223
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Slet ikke"
 
-#: mail/mail-accounts.c:297 mail/mail-accounts.c:335
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: mail/mail-accounts.c:297 mail/mail-accounts.c:337
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr "Aktiver"
 
 #. translators: default account indicator
-#: mail/mail-accounts.c:377
+#: mail/mail-accounts.c:433
 msgid "[Default]"
 msgstr "[Standard]"
 
-#: mail/mail-accounts.c:422 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:811
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: mail/mail-accounts.c:427 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Kontonavn"
 
-#: mail/mail-accounts.c:429 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -12164,11 +12180,11 @@ msgstr ""
 "og er blevet opdateret."
 
 #. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:102 widgets/misc/e-messagebox.c:226
+#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
 msgid "Don't show this message again."
 msgstr "Vis ikke denne besked igen."
 
-#: mail/mail-callbacks.c:191
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -12180,7 +12196,7 @@ msgstr ""
 "modtage eller skrive beskeder.\n"
 "Vil du konfigurere den nu?"
 
-#: mail/mail-callbacks.c:214
+#: mail/mail-callbacks.c:211
 msgid ""
 "You need to configure an account\n"
 "before you can compose mail."
@@ -12188,7 +12204,7 @@ msgstr ""
 "Du skal konfigurere en konto\n"
 "inden du kan skrive e-post."
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12196,7 +12212,7 @@ msgstr ""
 "Du skal konfigurere en identitet\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12205,7 +12221,7 @@ msgstr ""
 "før du kan skrive e-post."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:257
+#: mail/mail-callbacks.c:254
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
@@ -12213,11 +12229,11 @@ msgstr ""
 "Du sender et HTML-formaterat brev. Sørg for at følgende\n"
 "modtagere ønsker, og kan modtage, HTML-formateret e-post:\n"
 
-#: mail/mail-callbacks.c:269
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Send alligevel?"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12225,7 +12241,7 @@ msgstr ""
 "Denne besked har ikke et emne.\n"
 "Send alligevel?"
 
-#: mail/mail-callbacks.c:317
+#: mail/mail-callbacks.c:313
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -12233,11 +12249,11 @@ msgstr ""
 "Siden kontaktlisten du sender til er konfigureret til at skjule listens "
 "adresser vil denne besked kun indeholde Bcc-modtagere."
 
-#: mail/mail-callbacks.c:321
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "Denne besked indeholder kun Bcc-modtagere."
 
-#: mail/mail-callbacks.c:326
+#: mail/mail-callbacks.c:322
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -12247,11 +12263,11 @@ msgstr ""
 "\"Apparently-To\" header.\n"
 "Send alligevel?"
 
-#: mail/mail-callbacks.c:460
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Du skal specificere modtagere for at kunne sende denne besked."
 
-#: mail/mail-callbacks.c:716
+#: mail/mail-callbacks.c:722
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -12259,28 +12275,28 @@ msgstr ""
 "Kunne ikke åbne skitse-mappen for denne konto.\n"
 "Vil du bruge standard skitse-mappe?"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "en ukendt afsender"
 
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
 
-#: mail/mail-callbacks.c:1692 mail/message-browser.c:143
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "Flyt beskeder til"
 
-#: mail/mail-callbacks.c:1694 mail/message-browser.c:145
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Kopiér beskeder til"
 
-#: mail/mail-callbacks.c:2338
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker på at du vil redigere alle %d beskeder?"
 
-#: mail/mail-callbacks.c:2354
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12288,7 +12304,7 @@ msgstr ""
 "Du kan kun redigere beskeder gemt\n"
 "i Skitser-kataloget."
 
-#: mail/mail-callbacks.c:2390
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12296,16 +12312,16 @@ msgstr ""
 "Du kan kun sende beskeder igen\n"
 "som er gemt i sendt-kataloget."
 
-#: mail/mail-callbacks.c:2400
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker på at du vil sende alle %d beskederne igen?"
 
-#: mail/mail-callbacks.c:2420
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Ingen besked valgt"
 
-#: mail/mail-callbacks.c:2461
+#: mail/mail-callbacks.c:2465
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12314,7 +12330,7 @@ msgstr ""
 "Kan ikke gemme til \"%s\":\n"
 " %s"
 
-#: mail/mail-callbacks.c:2466
+#: mail/mail-callbacks.c:2470
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12323,15 +12339,15 @@ msgstr ""
 "\"%s\" findes allerede.\n"
 "Vil du overskrive den?"
 
-#: mail/mail-callbacks.c:2507
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Gem besked som..."
 
-#: mail/mail-callbacks.c:2509
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:2677
+#: mail/mail-callbacks.c:2687
 msgid ""
 "This operation will permanently erase all messages marked as\n"
 "deleted. If you continue, you will not be able to recover these messages.\n"
@@ -12344,7 +12360,7 @@ msgstr ""
 "\n"
 "Vil du virkelig fjerne disse meddelelser?"
 
-#: mail/mail-callbacks.c:2763
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12353,62 +12369,58 @@ msgstr ""
 "Fejl under indlæsning af filter-information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2771
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2813
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d af %d"
 
-#: mail/mail-callbacks.c:2869
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:2936
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Fejl under udskrift af besked"
 
-#: mail/mail-callbacks.c:3126
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker på at du vil åbne alle %d beskeder i separate vinduer?"
 
-#: mail/mail-composer-prefs.c:226
-msgid ""
-"Please specify signature filename\n"
-"in Advanced section of signature settings."
-msgstr ""
-"Angiv filnavn for signaturen i den\n"
-"avancerede del af signaturindstillingerne."
-
-#: mail/mail-composer-prefs.c:245 mail/mail-composer-prefs.c:247
-#: mail/mail-composer-prefs.c:376 mail/mail-composer-prefs.c:431
-msgid "[script]"
-msgstr "[skript]"
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+msgid "Unnamed"
+msgstr "Navnløs"
 
-#: mail/mail-composer-prefs.c:320
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr "Du skal angive et gyldigt skriptnavn."
 
-#: mail/mail-composer-prefs.c:335 mail/mail-config.c:1393
-msgid "Unnamed"
-msgstr "Navnløs"
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+msgid "[script]"
+msgstr "[skript]"
 
-#: mail/mail-composer-prefs.c:815
+#: mail/mail-composer-prefs.c:864
 msgid "Language(s)"
 msgstr "Sprog"
 
-#: mail/mail-composer-prefs.c:859
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Tilføj skriptsignatur"
 
-#: mail/mail-composer-prefs.c:878
+#: mail/mail-composer-prefs.c:926
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: mail/mail-config-druid.c:147
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Identitet"
+
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12418,7 +12430,12 @@ msgstr ""
 "er ikke obligatoriske, medmindre du ønsker at inkludere informationen i den "
 "e-post du sender."
 
-#: mail/mail-config-druid.c:149
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "_Modtager post"
+
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12426,11 +12443,16 @@ msgstr ""
 "Angiv information om din server for inkommende e-post nedenfor. Hvis du ikke "
 "er sikker bør du spørge din systemadministrator eller Internetleverandør."
 
-#: mail/mail-config-druid.c:151
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Venligst vælg mellem følgende alternativer"
 
-#: mail/mail-config-druid.c:153
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "_Afsendelse af post"
+
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12438,7 +12460,11 @@ msgstr ""
 "Angiv information om hvordan du vil sende e-post. Hvis du ikke er sikker bør "
 "du spørge din systemadministrator eller Internetleverandør."
 
-#: mail/mail-config-druid.c:155
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Håndtering af konti"
+
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12451,16 +12477,11 @@ msgstr ""
 "en Evolution-epostkonto. Angiv et navn for denne konto nedenfor. Dette navn "
 "anvendes kun til visning."
 
-#. set window title
-#: mail/mail-config-druid.c:645
-msgid "Evolution Account Assistant"
-msgstr "Evolution kontoassistent"
-
-#: mail/mail-config.c:1097
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Tjekker tjeneste"
 
-#: mail/mail-config.c:1175 mail/mail-config.c:1179
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "Kobler til server..."
 
@@ -12488,10 +12509,6 @@ msgstr "Kontoredigeringsværktøj"
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Håndtering af konti"
-
 #: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
 msgstr "Tilføj sk_ript"
@@ -12573,13 +12590,14 @@ msgid "Configuration"
 msgstr "Konfiguration"
 
 #: mail/mail-config.glade.h:33
+#, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
 "Tillykke, din e-post-konfiguration er nu fuldført.\n"
 "\n"
@@ -12616,7 +12634,7 @@ msgstr "Citér ikke originalmeddelelse"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Signér ikke _mødeindkaldelser (for kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Færdig"
 
@@ -12645,221 +12663,222 @@ msgid "Empty _trash folders on exit"
 msgstr "Tøm _affaldsmappe ved afslutning"
 
 #: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Evolution kontoassistent"
+
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Kør kommando..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Fast _bredde:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Font Properties"
 msgstr "Skrifttypeegenskaber"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Format messages in _HTML"
 msgstr "Formatér meddelelser i _HTML"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "Hent digitalt ID..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Markér _citat med"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Identitet"
-
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Indlejret"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Etiketter og farver"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Indlæser billeder"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "E-post-konfiguration"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Placering af postboks"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Meddelelseredigeringsværktøj"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Meddelelsesvisning"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Besked indeholder"
+
+#: mail/mail-config.glade.h:76
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Notifikation om ny post"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Bemærk: du bliver ikke spurgt om adgangskoden før du tilslutter første gange"
 
-#: mail/mail-config.glade.h:79
-msgid "On Screen fonts"
-msgstr "Skærmskrifttype"
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Yderligere information"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_nøgleid:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Vælg en farve"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spørg når der sendes meddelelser kun med blindkopimodtagere"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "Printed Fonts"
 msgstr "Udskrevne skrifttyper"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "Quote original message"
 msgstr "Citér originalmeddelelse"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Citeret"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "H_usk denne adgangskode"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr "Sva_r til:"
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "Modtager e-post"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "Receiving _Options"
 msgstr "_Modtagelsesmuligheder"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr "Husk denne _adgangskode"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Nødvendig information"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "Restore Defaults"
 msgstr "Genetablér standardalternativ"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "S_ikkerhed"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr "Vælg HTML-skrifttype med fast bredde"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr "Vælg HTML-skrifttype med fast bredde til udskrivning"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr "Vælg HTML-skrifttype med variabel bredde"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr "Vælg HTML-skrifttype med variabel bredde til udskrift"
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Mappe til sendte _beskeder:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Sendte beskeder og udkast"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Server kræver _godkendelse"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "Server_type: "
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr "Genvejs_type:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr "Angiv _filnavn:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "Stave_kontrol"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12869,16 +12888,16 @@ msgstr ""
 "din signatur. Navnet du angiver vil bare\n"
 "anvendas for visning."
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"Denne side lader dig konfigurere opførsel af stavekontrol og sprog. Listen med sprog her "
-"viser kun de sprog for hvilke en ordbog er installeret."
+"Denne side lader dig konfigurere opførsel af stavekontrol og sprog. Listen "
+"med sprog her viser kun de sprog for hvilke en ordbog er installeret."
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12886,84 +12905,81 @@ msgstr ""
 "Indtast navnet via hvilket du vil referere til denne konto.\n"
 "For eksempel: \"Job\" eller \"Personlig\"."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
+#, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 "Velkommen til assistenten for konfiguration af Evolution e-post.\n"
 "\n"
 "Klik \"Næste\" for at begynde. "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Tilføj signatur"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Altid indlæs billeder fra nettet"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Altid signér udgående beskeder når denne konto bruges"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autenticeringstype: "
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Godkendelsesstype: "
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "Hent beskeder _automatisk hver(t)"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Indsæt _automatisk smiley-billeder"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Bib når ny post ankommer"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "_Bekræft når en folder udrenses"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr "_Standardsignatur:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "_Standardværdier"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Notificér mig ikke når ny post ankommer"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "_Aktivér"
 
-#: mail/mail-config.glade.h:151
-msgid "_Fixed-width:"
-msgstr "_Fast bredde:"
-
 #: mail/mail-config.glade.h:152
 msgid "_Forward style:"
 msgstr "_Videresendelsesformat:"
@@ -13041,22 +13057,32 @@ msgid "_Signatures"
 msgstr "_Signaturer"
 
 #: mail/mail-config.glade.h:174
-msgid "_Use secure connection (SSL):"
-msgstr "_Brug sikker anslutning (SSL):"
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Sand Point"
 
 #: mail/mail-config.glade.h:175
-msgid "_Variable-width:"
-msgstr "_Variabel bredde:"
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Oprindelig kontakt:"
 
 #: mail/mail-config.glade.h:176
+msgid "_Use secure connection (SSL):"
+msgstr "_Brug sikker anslutning (SSL):"
+
+#: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "_hver"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "farve"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "beskrivelse"
 
@@ -13080,7 +13106,7 @@ msgstr "Kunne ikke oprette S/MIME \"envelope\" kontekst."
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikke oprette S/MIME afkodningskontekst."
 
-#: mail/mail-display.c:192
+#: mail/mail-display.c:193
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -13089,74 +13115,70 @@ msgstr ""
 "Filen \"%s\" findes allerede.\n"
 "Skal den overskrives?"
 
-#: mail/mail-display.c:195
-msgid "Overwrite file?"
-msgstr "Overskriv fil?"
-
-#: mail/mail-display.c:330
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Gem bilag"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:406
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Kunne ikke oprette temporær fil \"%s\": %s"
 
-#: mail/mail-display.c:451
+#: mail/mail-display.c:454
 msgid "Save Attachment..."
 msgstr "Gem bilag..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Vis indlejret"
 
-#: mail/mail-display.c:453
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Åbn i %s..."
 
-#: mail/mail-display.c:509
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis indlejret (via %s)"
 
-#: mail/mail-display.c:513
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:533
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:1333
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr "Henter billeder"
 
-#: mail/mail-display.c:1510
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Indlæser beskedsindhold"
 
-#: mail/mail-display.c:1852
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr "Overskredet:"
 
-#: mail/mail-display.c:1856
+#: mail/mail-display.c:1883
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "den %d. %B %Y %H:%M"
 
-#: mail/mail-display.c:2209
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Åbn henvisning i netlæser"
 
-#: mail/mail-display.c:2210
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Kopiér henvisning"
 
-#: mail/mail-display.c:2212
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Gem henvisning som"
 
-#: mail/mail-display.c:2214
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Gem billede som..."
 
@@ -13165,13 +13187,13 @@ msgstr "Gem billede som..."
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: mail/mail-format.c:639
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilag"
 
-#: mail/mail-format.c:681 mail/mail-format.c:1367 mail/mail-format.c:1436
-#: mail/mail-format.c:1556 mail/mail-format.c:1680 mail/mail-format.c:1705
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
 
@@ -13179,89 +13201,89 @@ msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:843
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Ugyldig e-post-adresse:"
 
-#: mail/mail-format.c:884 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Fra"
 
-#: mail/mail-format.c:888
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:898
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:903
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1479
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Denne besked er digitalt signeret. For flere informationer, klik på "
 "låsikonen."
 
-#: mail/mail-format.c:1507
+#: mail/mail-format.c:1479
 msgid "Could not create a PGP verfication context"
 msgstr "Kunne ikke oprette en PGP-verifieringssammenhæng"
 
-#: mail/mail-format.c:1515
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Denne besked er digitalt signeret og er fundet autentisk."
 
-#: mail/mail-format.c:1522
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
 
-#: mail/mail-format.c:1786
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-server (%s)"
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peger til lokal fil (%s) gyldig på netsted \"%s\""
 
-#: mail/mail-format.c:1800
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/mail-format.c:1827
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peger til eksterne data (%s)"
 
-#: mail/mail-format.c:1833
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:1835
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
-#: mail/mail-local.c:536 mail/mail-local.c:538
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, c-format
 msgid "Local folders/%s"
 msgstr "Lokale mapper/%s"
 
-#: mail/mail-local.c:666
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13270,22 +13292,22 @@ msgstr ""
 "Kan ikke gemme mappemetainformation; du vil måske\n"
 "opdage at du ikke kan åbne denne mappe længere: %s: %s"
 
-#: mail/mail-local.c:803
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan ikke gemme metainformation om mappe på: %s: %s"
 
-#: mail/mail-local.c:855
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan ikke slette metainformation for mappe %s: %s"
 
-#: mail/mail-local.c:1328
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Ændrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:1350
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13293,16 +13315,16 @@ msgstr ""
 "Hvis du ikke kan åbne denne postboks igen må\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1449
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigurér /%s igen"
 
-#: mail/mail-local.c:1513
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan ikke ændre format på en ikke-lokal mappe."
 
-#: mail/mail-mt.c:256
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13311,7 +13333,7 @@ msgstr ""
 "Fejl under '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13320,7 +13342,7 @@ msgstr ""
 "Fejl under udførsel af operation:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Arbejder"
 
@@ -13421,7 +13443,7 @@ msgstr "Henter %d beskeder"
 msgid "Saving %d messsage(s)"
 msgstr "Gemmer %d beskeder"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13430,7 +13452,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13439,11 +13461,11 @@ msgstr ""
 "Fejl under gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13452,58 +13474,54 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2213
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2213
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
 
-#: mail/mail-search-dialogue.c:120 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_Søg"
-
-#: mail/mail-search.c:128
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Besked uden titel)"
 
-#: mail/mail-search.c:219
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Besked uden titel"
 
-#: mail/mail-search.c:221
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Tom besked"
 
-#: mail/mail-search.c:269
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Find i besked"
 
-#: mail/mail-search.c:272
+#: mail/mail-search.c:285
 msgid "Search"
 msgstr "Søgning"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Skeln mellem store og små bogstaver"
 
-#: mail/mail-search.c:300
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "Søg fremad"
 
-#: mail/mail-search.c:320
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Find:"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Træffere:"
 
@@ -13542,24 +13560,24 @@ msgstr "Opdaterer..."
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-session.c:214
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "Operation afbrudt af bruger."
 
-#: mail/mail-session.c:247
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: mail/mail-session.c:249
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:280
 msgid "_Remember this password"
 msgstr "Husk denne adgangs_kode"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:281
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Husk denne adgangskode for resten af denne session"
 
@@ -13568,7 +13586,7 @@ msgstr "_Husk denne adgangskode for resten af denne session"
 msgid "Could not save signature file: %s"
 msgstr "Kunne ikke gemme signaturfilen: %s"
 
-#: mail/mail-signature-editor.c:175
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13578,50 +13596,50 @@ msgstr ""
 "\n"
 "Vil du gemme ændringene?"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:229
 msgid "_Discard changes"
 msgstr "_Forkast ændringer"
 
-#: mail/mail-signature-editor.c:182
+#: mail/mail-signature-editor.c:233
 msgid "Save signature"
 msgstr "Gem signatur"
 
-#: mail/mail-signature-editor.c:327
+#: mail/mail-signature-editor.c:389
 msgid "Edit signature"
 msgstr "Redigér signatur"
 
-#: mail/mail-signature-editor.c:365
+#: mail/mail-signature-editor.c:429
 msgid "Enter a name for this signature."
 msgstr "Angiv et navn for denne signatur."
 
-#: mail/mail-signature-editor.c:368 my-evolution/e-summary-preferences.c:622
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Navn:"
 
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt besked - %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Videresendt besked"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Videresendt besked"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Opsætter vmappe: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Opdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13634,11 +13652,11 @@ msgstr ""
 "    '%s'\n"
 "Og er blevet opdateret."
 
-#: mail/mail-vfolder.c:776 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "Virtuelle mapper "
 
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "vMapper"
 
@@ -13651,15 +13669,15 @@ msgstr "Rediger Virtuel mappe"
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Prøver at redigere en vfolder '%s' som ikke eksisterer."
 
-#: mail/mail-vfolder.c:945
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Ny Virtuel mappe"
 
-#: mail/message-browser.c:219
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Uden emne)"
 
-#: mail/message-browser.c:221
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Besked"
@@ -13700,31 +13718,31 @@ msgstr "Højere"
 msgid "Highest"
 msgstr "Højest"
 
-#: mail/message-list.c:1076
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "I dag %H:%M"
 
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "I går %H:%M"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1112
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: mail/message-list.c:1114
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2599
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Genererer beskedsliste"
 
@@ -13820,12 +13838,12 @@ msgstr "_Skal leveres den:"
 msgid "_Flag:"
 msgstr "_Flag:"
 
-#: mail/subscribe-dialog.c:232
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Søger i mapper under %s på \"%s\""
 
-#: mail/subscribe-dialog.c:234
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Søger i mapper på rod-niveau på \"%s\""
@@ -13840,32 +13858,24 @@ msgstr "Abonnerer på mappe \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement på mappe \"%s\""
 
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mappe"
 
-#: mail/subscribe-dialog.c:1427
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Gennemsøger mapper..."
 
-#: mail/subscribe-dialog.c:1549
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Ingen server er valgt"
 
-#: mail/subscribe-dialog.c:1624
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Venligst vælg en server."
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "All folders"
-msgstr "Alle mapper"
-
-#: mail/subscribe-dialog.glade.h:4
-msgid "Apri file"
-msgstr "Apri-fil"
-
-#: mail/subscribe-dialog.glade.h:5 ui/evolution-comp-editor.xml.h:2
+#: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -13874,51 +13884,46 @@ msgstr "Apri-fil"
 msgid "Close"
 msgstr "Luk"
 
-#: mail/subscribe-dialog.glade.h:6
-msgid "Display Options"
-msgstr "Visningsalternativer"
-
-#: mail/subscribe-dialog.glade.h:7
-msgid "Folders whose names begin with:"
-msgstr "Vis mapper med navn som begynder med:"
-
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:4
 msgid "Manage Subscriptions"
 msgstr "Håndtér abonnement"
 
-#: mail/subscribe-dialog.glade.h:9 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Læs listen igen"
 
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:6
 msgid "S_elect server: "
 msgstr "V_ælg server: "
 
-#: mail/subscribe-dialog.glade.h:11
-msgid "Salve file"
-msgstr "Salve-fil"
-
-#: mail/subscribe-dialog.glade.h:12
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: mail/subscribe-dialog.glade.h:13
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configuration control for the Evolution Summary."
-msgstr "Konfigurationsværktøj for Evolution-sammenfatningen."
-
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Konfigurér udseendet af Evolution-sammenfatningerne."
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Evolutions sammenfatningskomponent."
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component."
+#, fuzzy
+msgid "Evolution Summary component"
 msgstr "Evolutions sammenfatningskomponent."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Evolutions sammenfatningskomponent."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "Sammenfatningsindstillinger"
 
@@ -23707,36 +23712,37 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zürich"
 
-#: my-evolution/component-factory.c:54
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr "Mappe som indeholder Evolution sammendrag"
 
-#: my-evolution/e-summary-calendar.c:377 my-evolution/e-summary-calendar.c:397
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "Aftaler"
 
-#: my-evolution/e-summary-calendar.c:378
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Ingen aftaler"
 
-#: my-evolution/e-summary-calendar.c:414
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:416
-msgid "%l:%M %d %B"
+#: my-evolution/e-summary-calendar.c:407
+#, fuzzy
+msgid "%l:%M%P %d %B"
 msgstr "%l: %M %d %B"
 
-#: my-evolution/e-summary-calendar.c:434
+#: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr "Inegn beskrivelse"
 
-#: my-evolution/e-summary-mail.c:156
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "E-post sammendrag"
 
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1119
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
@@ -23748,19 +23754,19 @@ msgstr "Dictionary.com Ord for dagen"
 msgid "Quotes of the Day"
 msgstr "Dagens citater"
 
-#: my-evolution/e-summary-preferences.c:612
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Tilføj nyheds-server"
 
-#: my-evolution/e-summary-preferences.c:618
+#: my-evolution/e-summary-preferences.c:621
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Indtast URL for nyhedsstedet du vil tilføje"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "Fejl under nedhentning af RDF"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Nyhedstjenester"
 
@@ -23777,11 +23783,11 @@ msgstr "Tilføj"
 msgid "Shown"
 msgstr "Viste"
 
-#: my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Ingen opgaver"
 
-#: my-evolution/e-summary-tasks.c:371
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(Ingen beskrivelse)"
 
@@ -23789,11 +23795,11 @@ msgstr "(Ingen beskrivelse)"
 msgid "My Weather"
 msgstr "Min vejrbesked"
 
-#: my-evolution/e-summary-weather.c:269
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr "Et fejl opstod ved hentning af data for"
 
-#: my-evolution/e-summary-weather.c:490
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Vejr"
 
@@ -23801,23 +23807,23 @@ msgstr "Vejr"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:592
+#: my-evolution/e-summary-weather.c:584
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary.c:199
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%A %e. %B %Y"
 
-#: my-evolution/e-summary.c:512
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "Venligst vent..."
 
-#: my-evolution/e-summary.c:590 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Udskriv sammendrag"
 
-#: my-evolution/e-summary.c:624
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Fejl under udskrift af sammendrag"
 
@@ -25089,20 +25095,21 @@ msgid "_Weather"
 msgstr "_Vejr"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr "Konfigurationsværktøj for Evolutions mappeindstillinger."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr "Konfigurér opførsel for specialmapper og frakoblede mapper her"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution skallen."
+
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
-msgstr "Mappeindstillinger"
+msgid "Evolution folder settings configuration control"
+msgstr ""
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "Evolution skallen."
+msgid "Folder Settings"
+msgstr "Mappeindstillinger"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25121,7 +25128,7 @@ msgstr ""
 "Kan ikke overføre mappe:\n"
 "%s"
 
-#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:127
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "\"%s\" i \"%s\""
@@ -25134,8 +25141,8 @@ msgstr "Tilføj en mappe"
 msgid "Drafts"
 msgstr "Skitser"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:467
-#: shell/e-shell-view.c:471 shell/e-shortcuts.c:1083
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Indbakke"
 
@@ -25147,11 +25154,11 @@ msgstr "Udboks"
 msgid "Sent"
 msgstr "Sendt"
 
-#: shell/e-setup.c:147
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Kunne ikke opdatere filerne."
 
-#: shell/e-setup.c:168
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -25162,7 +25169,7 @@ msgstr ""
 "%s\n"
 "Fejl: %s"
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -25174,39 +25181,6 @@ msgstr ""
 #: shell/e-setup.c:244
 #, c-format
 msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution kunne ikke oprette katalog\n"
-"%s:\n"
-"%s"
-
-#: shell/e-setup.c:262
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-"Katalog %s\n"
-"har ikke korrekte rettigheder. Venligst gør den\n"
-"læsbar og kørbar og start Evolution igen."
-
-#: shell/e-setup.c:268
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-"Filen %s\n"
-"bør fjernes for at Evolution skal fungere rigtigt.\n"
-"Venligst fjern denne fil og start Evolution igen."
-
-#: shell/e-setup.c:291
-#, c-format
-msgid ""
 "The file `%s' is not a directory.\n"
 "Please move it in order to allow installation\n"
 "of the Evolution user files."
@@ -25215,7 +25189,7 @@ msgstr ""
 "Venligst flyt dette for at tillade installation\n"
 "af Evolution's brugerfiler."
 
-#: shell/e-setup.c:300
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25250,47 +25224,47 @@ msgstr "Frakobletmapper"
 msgid "Autocompletion Folders"
 msgstr "Mapper for automatisk udfyldning"
 
-#: shell/e-shell-folder-commands.c:141
+#: shell/e-shell-folder-commands.c:140
 #, c-format
 msgid "Cannot copy folder: %s"
 msgstr "Kan ikke kopiere mappe: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, c-format
 msgid "Cannot move folder: %s"
 msgstr "Kan ikke flytte mappe: %s"
 
-#: shell/e-shell-folder-commands.c:189
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Kan ikke flytte en mappe over i sig selv."
 
-#: shell/e-shell-folder-commands.c:191
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Kan ikke kopiere en mappe over i sig selv."
 
-#: shell/e-shell-folder-commands.c:205
+#: shell/e-shell-folder-commands.c:204
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Kan ikke flytte en mappe til en af dens egne undermapper."
 
-#: shell/e-shell-folder-commands.c:320
+#: shell/e-shell-folder-commands.c:319
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Specificér en mappe som mappen \"%s\" skal kopieres til:"
 
-#: shell/e-shell-folder-commands.c:324
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Kopiér mappe"
 
-#: shell/e-shell-folder-commands.c:364
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Specificér en mappe at flytte mappen \"%s\" til:"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Flyt mappe"
 
-#: shell/e-shell-folder-commands.c:392
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25299,17 +25273,17 @@ msgstr ""
 "Kunne ikke slette mappe:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
+#: shell/e-shell-folder-commands.c:405
 #, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Skal mappen \"%s\" virkelig fjernes?"
 
-#: shell/e-shell-folder-commands.c:413
+#: shell/e-shell-folder-commands.c:412
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Slet \"%s\""
 
-#: shell/e-shell-folder-commands.c:486
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25318,26 +25292,26 @@ msgstr ""
 "Kunne ikke ændre navn på mappe:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ændr navn på mappe \"%s\" til:"
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Ændr navn på mappe"
 
-#: shell/e-shell-folder-commands.c:550
-#: shell/e-shell-folder-creation-dialog.c:169
+#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-creation-dialog.c:170
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Specificeret mappenavn er ikke gyldigt: %s"
 
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:583
 msgid "Selected folder does not belong to another user"
 msgstr "Den valgte mappe tilhører ikke en anden bruger"
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:586
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25346,7 +25320,7 @@ msgstr ""
 "Kan ikke fjerne mappen:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
+#: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25355,11 +25329,11 @@ msgstr ""
 "Kan ikke oprette specificeret katalog:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:308
 msgid "Create New Folder"
 msgstr "Opret ny mappe"
 
-#: shell/e-shell-folder-title-bar.c:648 shell/e-shell-folder-title-bar.c:649
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Uden navn)"
 
@@ -25381,7 +25355,7 @@ msgstr ""
 "Du kan vælge \"Automatisk\" hvis du ikke véd, så vil Evolution prøve at "
 "finde ud af hvilken type det er for dig."
 
-#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:818
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Venligst vælg information du ønsker at importere:"
 
@@ -25394,7 +25368,7 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opføring %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:351
 msgid "Select importer"
 msgstr "Vælg importør"
 
@@ -25404,7 +25378,7 @@ msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
 #: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
-#: shell/e-shell-importer.c:557
+#: shell/e-shell-importer.c:552
 msgid "Evolution Error"
 msgstr "Evolution fejl"
 
@@ -25435,12 +25409,12 @@ msgstr ""
 msgid "Error starting %s"
 msgstr "Fejl under start af %s"
 
-#: shell/e-shell-importer.c:556
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Fejl under indlæsning af %s"
 
-#: shell/e-shell-importer.c:573
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25449,31 +25423,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opføring 1."
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Vælg en fil"
 
-#: shell/e-shell-importer.c:690
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:715
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Importer data og indstillinger fra andre programmer"
 
-#: shell/e-shell-importer.c:719
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Importer en enkelt fil"
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:644
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25481,28 +25455,28 @@ msgstr ""
 "Venligst vent...\n"
 "Søger efter eksisterende opsætning"
 
-#: shell/e-shell-importer.c:788
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent importering"
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:772
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1082
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: shell/e-shell-importer.c:1083
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Vælg en målmappe til at importere data"
 
-#: shell/e-shell-importer.c:1195 shell/importer/intelligent.c:191
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Importér"
 
-#: shell/e-shell-offline-handler.c:588
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
@@ -25525,49 +25499,44 @@ msgstr "Synkroniserer mappe"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Synkroniserer \"%s\" (%d af %d)..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr "Indstillinger for Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:340
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+#, fuzzy
+msgid "Please select a user."
+msgstr "Venligst vælg en server."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 msgid "Opening Folder"
 msgstr "Åbner mappe"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:346
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Åbner mappen \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:351
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, c-format
 msgid "in \"%s\" ..."
 msgstr "i \"%s\"..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:431
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Kunne ikke åbne den delte mappe: %s."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:484
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 msgid "Cannot find the specified shared folder."
 msgstr "Kan ikke oprette den angivne delte mappe."
 
-#: shell/e-shell-startup-wizard.c:156
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Kunne ikke starte postassistent-grænsefladen for Evolution\n"
-"(%s)"
-
-#: shell/e-shell-startup-wizard.c:167
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Kunne ikke starte postassistent-grænsefladen for Evolution\n"
-
 #: shell/e-shell-user-creatable-items-handler.c:582
 #: shell/e-shell-user-creatable-items-handler.c:636
-#: widgets/misc/e-charset-picker.c:105
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr "Ny"
 
@@ -25580,10 +25549,16 @@ msgid "Folder name cannot contain the Return character."
 msgstr "Mappenavn kan ikke indeholde linjeskift."
 
 #: shell/e-shell-utils.c:129
-msgid "Folder name cannot contain slashes."
-msgstr "Et mappenavn kan ikke indeholde et skråstreg (/)."
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Mappenavn kan ikke indeholde linjeskift."
 
 #: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Mappenavn kan ikke indeholde linjeskift."
+
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' og '..' er reserverede mappenavne."
 
@@ -25625,48 +25600,48 @@ msgstr "Opret ny genvej"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vælg mappen du ønsker genvejen skal pege til:"
 
-#: shell/e-shell-view-menu.c:776
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "_Arbejd tilkoblet"
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr "Ar_bejd frakoblet"
 
-#: shell/e-shell-view-menu.c:802 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr "Arbejd frakoblet"
 
-#: shell/e-shell-view.c:234
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1998
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:2000
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:2043
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution er koblet til. Klik på denne knap for at arbejde frakoblet."
 
-#: shell/e-shell-view.c:2050
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution er i færd med at koble fra."
 
-#: shell/e-shell-view.c:2056
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution er frakoblet. Klik på denne knap for at arbejde tilkoblet."
 
-#: shell/e-shell.c:176
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25677,12 +25652,12 @@ msgstr ""
 "Fejlen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/e-shell.c:756
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke opsætte lokal lagring -- %s"
 
-#: shell/e-shell.c:1829
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25693,19 +25668,19 @@ msgstr ""
 "er afsluttet uventet. Du må afslutte Evolution og genstarte\n"
 "for at få adgang til disse data igen."
 
-#: shell/e-shell.c:2094
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:2096
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:2098
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabase ikke fundet"
 
-#: shell/e-shell.c:2100 shell/e-storage.c:576
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Generisk fejl"
 
@@ -25717,116 +25692,116 @@ msgstr "Opret ny genvejsgruppe"
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:179
 #, c-format
 msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
 msgstr "Vil du virkelig fjerne gruppen '%s' fra genvejslinjen?"
 
-#: shell/e-shortcuts-view.c:216
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Omdøb genvejsgruppen"
 
-#: shell/e-shortcuts-view.c:217
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Ændr valgt genvejsgruppe til:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "_Små ikoner"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Vis genveje som små ikoner"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Vis genveje som store ikoner"
 
-#: shell/e-shortcuts-view.c:264
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Opret en ny genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "Fje_rn denne gruppe..."
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Fjern denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:270
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "_Omdøb denne gruppe..."
 
-#: shell/e-shortcuts-view.c:271
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Omdøb denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "Sk_jul genvejslinjen"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Skjul genvejslinjen"
 
-#: shell/e-shortcuts-view.c:282
+#: shell/e-shortcuts-view.c:281
 msgid "Create _Default Shortcuts"
 msgstr "Opret _standardgenveje"
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:282
 msgid "Create Default Shortcuts"
 msgstr "Opret standardgenveje"
 
-#: shell/e-shortcuts-view.c:402
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Omdøb genvej"
 
-#: shell/e-shortcuts-view.c:403
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Omdøb valgt genvej til:"
 
-#: shell/e-shortcuts-view.c:416
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Åbn mappen som denne genvej henviser til"
 
-#: shell/e-shortcuts-view.c:418 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Åbn i nyt _vindue"
 
-#: shell/e-shortcuts-view.c:418
+#: shell/e-shortcuts-view.c:417
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Åbn mappen som denne genvej henviser til i et nyt vindue"
 
-#: shell/e-shortcuts-view.c:421
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "Omdøb"
 
-#: shell/e-shortcuts-view.c:421
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Omdøb denne genvej"
 
-#: shell/e-shortcuts-view.c:423
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "_Fjern"
 
-#: shell/e-shortcuts-view.c:423
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne genvej fra genvejslinjen"
 
-#: shell/e-shortcuts.c:648
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Fejl ved gemning af genveje."
 
-#: shell/e-shortcuts.c:1095
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Genveje"
 
@@ -25834,59 +25809,59 @@ msgstr "Genveje"
 msgid "Checkbox"
 msgstr "Afkrydsningsboks"
 
-#: shell/e-storage.c:574
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Ingen fejl"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Specificeret mappetype er ikke gyldig"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "I/U-fejl"
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plads til at oprette mappen"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "Mappen er ikke tom"
 
-#: shell/e-storage.c:588
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "Specificeret mappe blev ikke fundet"
 
-#: shell/e-storage.c:590
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Funktionen er ikke implementeret i dette lager"
 
-#: shell/e-storage.c:594
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Operationen er ikke understøttet"
 
-#: shell/e-storage.c:596
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "Specificeret type er ikke understøttet for dette lager"
 
-#: shell/e-storage.c:598
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "Specificeret mappe kan ikke ændres eller fjernes"
 
-#: shell/e-storage.c:600
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan ikke gøre en mappe til barn af en af sine efterkommere"
 
-#: shell/e-storage.c:602
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr "Kan ikke oprette en mappe med det navn"
 
-#: shell/e-storage.c:604
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Denne handling kan ikke udføres i frakoblet tilstand"
 
@@ -25900,11 +25875,11 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fuldført)"
 
-#: shell/evolution-folder-selector-button.c:101
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klik her for at vælge en mappe>"
 
-#: shell/evolution-shell-component-utils.c:122
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -25915,7 +25890,7 @@ msgstr ""
 "\n"
 "Ukendt fejl."
 
-#: shell/evolution-shell-component-utils.c:125
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -25928,7 +25903,7 @@ msgstr ""
 "Fejlen fra komponentsystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:132
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -25941,87 +25916,79 @@ msgstr ""
 "Fejlen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1165
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA-fejl"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Afbrudt"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Ugyldige argumenter"
 
-#: shell/evolution-shell-component.c:1171
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Har en ejer allerede"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Ingen ejer"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Ikke fundet"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "En ikke-understøttet type"
 
-#: shell/evolution-shell-component.c:1179
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Et ikke understøttet skema"
 
-#: shell/evolution-shell-component.c:1181
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "En ikke-understøttet handling"
 
-#: shell/evolution-shell-component.c:1183
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Intern fejl"
 
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Eksisterer"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Har undermapper"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Ingen plads tilbage"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Tidligere ejer er død FIXME"
 
-#: shell/evolution-test-component.c:62
+#: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Testtype"
 
-#: shell/evolution-test-component.c:702
+#: shell/evolution-test-component.c:703
 msgid "Evolution Test Component"
 msgstr "Evolutions testkomponent"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Aktive opkoblinger"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
 msgstr "Klik OK for at lukke disse forbindelser og gå frakoblet"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Vært"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr "Følgende forbindelser er aktive:"
 
@@ -26069,29 +26036,30 @@ msgstr "_Mappenavn:"
 msgid "_User:"
 msgstr "_Bruger:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Opsætningsassistent for Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importerer filer"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Tidszone "
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
+#, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 "Velkommen til Evolution. De næste skærme lader dig\n"
 "konfigurere Evolution til at forbinde til dine e-post konti, og\n"
@@ -26099,12 +26067,13 @@ msgstr ""
 "\n"
 "Venligst klik 'Næste' for at fortsætte. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
+#, fuzzy
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 "Du har med held indtastet al information som behøves\n"
 "for at konfigurere Evolution. \n"
@@ -26162,25 +26131,26 @@ msgstr "Spørg mig ikke igen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra følgende filer:"
 
-#: shell/main.c:104 shell/main.c:474
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:110
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Evolution afslutter nu..."
 
-#: shell/main.c:209
-#, no-c-format
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:266
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -26192,8 +26162,8 @@ msgstr ""
 "Hej. Tak for at du tog dig tid til at hente denne forudgave\n"
 "af gruppeprogramsuiten Ximian Evolution.\n"
 "\n"
-"Denne version af Ximian Evolution er ikke færdig endnu. Det begynder at nærme "
-"sig,\n"
+"Denne version af Ximian Evolution er ikke færdig endnu. Det begynder at "
+"nærme sig,\n"
 "men der findes steder hvor funktioner enten mangler eller kun fungerer\n"
 "delvis.\n"
 "\n"
@@ -26205,10 +26175,11 @@ msgstr ""
 "Dette produkt leveres uden garanti og er ikke beregnet for\n"
 "personer der let får vredesudbrud.\n"
 "\n"
-"Vi håber at du vil være fornøjet med resultatet af vort hårde arbejde, og vi\n"
+"Vi håber at du vil være fornøjet med resultatet af vort hårde arbejde, og "
+"vi\n"
 "venter med spænding på dine bidrag!\n"
 
-#: shell/main.c:230
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26216,40 +26187,44 @@ msgstr ""
 "Tack\n"
 "Ximians Evolution-hold\n"
 
-#: shell/main.c:238
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "Fortæl mig det ikke igen"
 
-#: shell/main.c:357
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikke tilgå Ximian Evolution-skallen."
 
-#: shell/main.c:366
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikke initiere Ximian Evolution-skallen: %s"
 
-#: shell/main.c:446
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Deaktivér splash"
 
-#: shell/main.c:448
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Start i frakoblet tilstand"
 
-#: shell/main.c:450
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Start i opkoblet tilstand"
 
-#: shell/main.c:452
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr ""
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr "Send fejlsøgingsudskrift for alle komponenterne til en fil."
 
-#: shell/main.c:454
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Gennemtving opgradering af konfigurationsfiler fra Evolution 1.0.x"
 
-#: shell/main.c:478
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26259,7 +26234,6 @@ msgstr ""
 "  Brug %s --help for mere information.\n"
 
 #: tools/evolution-addressbook-abuse.c:81
-#: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Fejl ved indlæsning af adressebog."
@@ -26269,14 +26243,49 @@ msgstr "Fejl ved indlæsning af adressebog."
 msgid "Input File"
 msgstr "Inddatafil"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Uddatafil"
-
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Intet filnavn angivet."
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Tilføj bilag..."
+
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:327
+#, fuzzy
+msgid "Description of the attachment."
+msgstr "Beskrivelse indeholder"
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:329
+msgid "Default subject for the message."
+msgstr ""
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "Kunne ikke skifte navn på \"%s\": %s"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopiér kontakter til en anden mappe..."
@@ -26365,7 +26374,7 @@ msgstr "Vis den aktuelle kontakt"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr "H_andlinger"
 
@@ -26483,7 +26492,7 @@ msgid "Print this item"
 msgstr "Udskriv denne opføring"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:152
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "Gem"
 
@@ -26510,7 +26519,7 @@ msgstr "Gem denne opføring på disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Fil"
 
@@ -26756,7 +26765,7 @@ msgstr "Beskedsliste med tråde"
 msgid "_Expunge"
 msgstr "_Fjern slettede beskeder"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "M_appe"
 
@@ -27160,7 +27169,7 @@ msgstr "_Citeret"
 msgid "_Resend..."
 msgstr "Send igen..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Værktøjer"
 
@@ -27175,12 +27184,12 @@ msgstr "Luk dette vindue"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Close"
 msgstr "L_uk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "_Vis"
 
@@ -27359,7 +27368,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Gem den aktuelle fil og luk vinduet"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr "_Hjælp"
 
@@ -27536,122 +27545,114 @@ msgid "Pi_lot Settings..."
 msgstr "Pi_lotindstillinger..."
 
 #: ui/evolution.xml.h:27
-msgid "Pilot Con_duit Settings..."
-msgstr "Pilot_kanalsindstillinger..."
-
-#: ui/evolution.xml.h:28
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Fjern en mappe som tilføjedes med \"Åbn en anden brugers mappe\""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Send / modtag"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Send queued items and retrieve new items"
 msgstr "Send køede objekter og hent nye objekter"
 
-#: ui/evolution.xml.h:31
-msgid "Set up Pilot conduit configuration"
-msgstr "Konfigurér Pilotkanalskonfiguration"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Set up Pilot configuration"
 msgstr "Konfigurér Pilotkonfiguration"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Vis information om Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Indsend fejlrapport"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "Indsen_d fejlrapport"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Indsend en fejlrapport med Bug Buddy"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Skift"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Slå visning af mappelinjen fra/til"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Slå visning af genvejslinjen fra/til"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Skift til frakoblet arbejdsmodus."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Vis den valgte mappe"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _OSS"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Kopiér..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Mappelinje"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Folder..."
 msgstr "_Mappe..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "_Gå til mappe..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "_Importér..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Flyt..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 msgid "_Remove Other User's Folder"
 msgstr "_Fjern en anden brugers mappe"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Omdøb..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Send / modtag"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "_Genvejslinje"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr "_Genvej..."
 
@@ -27727,9 +27728,8 @@ msgstr "Med _kategori"
 msgid "_Tasks"
 msgstr "_Opgaver"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:201
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:688
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr "UTC"
 
@@ -27755,43 +27755,43 @@ msgstr ""
 "tidszone.\n"
 "Brug højre museknap til at zoome ud."
 
-#: widgets/menus/gal-view-menus.c:287
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:349
+#: widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Tilrettet visning"
 
-#: widgets/menus/gal-view-menus.c:358
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr "Gem tilrettet visning"
 
-#: widgets/menus/gal-view-menus.c:371
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "Definér visninger"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:431
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1104
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "nu"
 
-#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr "I dag"
 
-#: widgets/misc/e-cell-date-edit.c:802
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen skal skrives ind på formatet: %s"
@@ -27800,80 +27800,80 @@ msgstr "Datoen skal skrives ind på formatet: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentværdien skal være mellem 0 og 100, inklusive"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Central-europæisk"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Græsk"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Japansk"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Koreansk"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "UCS"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "Vest-europæisk"
 
-#: widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Traditionel"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr "Forenklet"
 
-#: widgets/misc/e-charset-picker.c:93
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: widgets/misc/e-charset-picker.c:96
+#: widgets/misc/e-charset-picker.c:97
 msgid "Visual"
 msgstr "Visuel"
 
-#: widgets/misc/e-charset-picker.c:165
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ukendt tegnsæt: %s"
 
-#: widgets/misc/e-charset-picker.c:207
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Indtast tegnsæt som skal bruges"
 
-#: widgets/misc/e-charset-picker.c:282
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Andre..."
 
-#: widgets/misc/e-charset-picker.c:402
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Tegnkodning"
 
@@ -27881,11 +27881,12 @@ msgstr "Tegnkodning"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:187
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Redigering af søgning"
 
-#: widgets/misc/e-filter-bar.c:209
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Gem søgning"
 
@@ -27917,46 +27918,464 @@ msgstr "Spørgsmål"
 msgid "Message"
 msgstr "Besked"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Søg"
+
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr "_Søg nu"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: widgets/misc/e-search-bar.c:823
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr "Objekt-ID"
 
-#: widgets/misc/e-search-bar.c:830
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr "Underobjekt-ID"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:847
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:915
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Tøm"
 
-#: widgets/misc/e-search-bar.c:917
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Find nu "
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Personlig adressebogs-server"
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Minikortvisning i Evolution adressebog"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
 #: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Personlig adressebogs-server; fabrik"
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Evolution kalender iTip/iMip-visning"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Minikortvisning i Evolution adressebog"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Fabrik til import af LDIF filer i Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importerer LDIF filer i Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Fabrik til import af VCard-filer i Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importerer VCard-filer i Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "En Bonobo-kontrol for visning af en adresse."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "En Bonobo-kontrol for visning af en adresse."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Eksempel på Bonobo-kontrol som viser en adressebog."
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "Konfigurationsstyrning for Evolution adressbogslagrene."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Kontrol som viser et minikort i Evolutions adressebog."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Evolution komponent til håndtering af kontakter."
+
+#~ msgid "Factory for the controls exported by the Evolution Addressbook"
+#~ msgstr "Fabrik for kontrollerne som exporteres af Evolutions adressbog"
+
+#~ msgid "1234"
+#~ msgstr "1234"
+
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "666"
+#~ msgstr "666"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<- _Fjern"
+
+#~ msgid "<< Fewer Options"
+#~ msgstr "<< Færre alternativer"
+
+#~ msgid "Add (or Edit) Attribute Mappings"
+#~ msgstr "Tilføj (eller rediger) attributmappninger"
+
+#~ msgid "DN Customization"
+#~ msgstr "DN-tilpasning"
+
+#~ msgid "Mappings"
+#~ msgstr "Mappninger"
+
+#~ msgid "Objectclasses"
+#~ msgstr "Objektklasser"
+
+#~ msgid "Objectclasses Used in Evolution:"
+#~ msgstr "Objektklasser der anvendes i Evolution:"
+
+#~ msgid "Objectclasses Used on Server:"
+#~ msgstr "Objektklasser der anvendes på servern:"
+
+#~ msgid ""
+#~ "Please select an Evolution attribute and an\n"
+#~ "LDAP attribute to associate with it."
+#~ msgstr ""
+#~ "Vælg et Evolution-attribut og en\n"
+#~ "LDAP-attribut at associere dermed."
+
+#~ msgid "R_estore Defaults"
+#~ msgstr "_Genskab standardinstillinger"
+
+#~ msgid "Re_store Defaults"
+#~ msgstr "_Genskab standardalternativ"
+
+#~ msgid ""
+#~ "To add an attribute to the DN, select it from the list and click the "
+#~ "\"Add Attribute\" button.\n"
+#~ "Any values that you add to the DN will become required values for any new "
+#~ "contacts\n"
+#~ "that you add to the directory on the LDAP server. "
+#~ msgstr ""
+#~ "For at tilføje et attribut til DN vælger du den fra listen og klikker på "
+#~ "knappen \"Tilføj attribut\".\n"
+#~ "Alle værdier som du tilføjer DN vil blive nødvendige værdier for alle\n"
+#~ "nye kontakter der tilføjes kataloget på LDAP-serveren."
+
+#~ msgid "_Add ->"
+#~ msgstr "_Tilføj ->"
+
+#~ msgid "_Add Mapping"
+#~ msgstr "_Tilføj afbildning"
+
+#~ msgid "_Add to DN"
+#~ msgstr "_Tilføj i DN"
+
+#~ msgid "_Always"
+#~ msgstr "_Altid"
+
+#~ msgid "_Delete Mapping"
+#~ msgstr "_Fjern afbildning"
+
+#~ msgid "_Distinguished Name (DN):"
+#~ msgstr "_Distinguished name (DN):"
+
+#~ msgid "_Don't use SSL/TLS"
+#~ msgstr "_Anvend ikke SSL/TLS"
+
+#~ msgid "_Edit Mapping"
+#~ msgstr "_Rediger afbildning"
+
+#~ msgid "_Evolution attribute:"
+#~ msgstr "_Evolution-attribut:"
+
+#~ msgid "_If necessary "
+#~ msgstr "_Om nødvendigt "
+
+#~ msgid "_LDAP attribute:"
+#~ msgstr "_LDAP-attribut:"
+
+#~ msgid "_LDAP attributes:"
+#~ msgstr "_LDAP-attributer:"
+
+#~ msgid "_More Options >>"
+#~ msgstr "_Flere muligheder >>"
+
+#~ msgid "_Restore Defaults"
+#~ msgstr "_Genskab standardværdier"
+
+#~ msgid "account-druid"
+#~ msgstr "kontoguide"
+
+#~ msgid "account-editor"
+#~ msgstr "kontoredigering"
+
+#~ msgid "dn-customization-tab"
+#~ msgstr "dn-tilpasningsfaneblad"
+
+#~ msgid "edit_server_window_simple"
+#~ msgstr "redigere_servervindue_enkel"
+
+#~ msgid "mappings-tab"
+#~ msgstr "afbildningsfaneblad"
+
+#~ msgid "objectclasses-tab"
+#~ msgstr "objektklassefaneblad"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Fabrik til adressebogens grænseflade for navnevalg"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Redigér kontaktliste"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Kontaktliste uden navn"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d ikke vist)"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "En Bonobo-kontrol der viser en opgaveliste."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "En Bonobo-kontrol der viser en kalender."
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Konfigurationsværktøj for Evolution-kalendern."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Evolution komponent for håndtering af kalenderen."
+
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Fabrik for Evolution-kalenderobjekter"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr ""
+#~ "Fabrik til centralisering af dialoger for kalender-komponent-redigering"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Alarm-tjeneste"
+
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders.  You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "Evolution understøtter endnu ikke e-postnotificering for påmindelser. Det "
+#~ "vil ikke være muligt at redigere mulighederne for denne påmindelse."
+
+#~ msgid "st"
+#~ msgstr "."
+
+#~ msgid "nd"
+#~ msgstr "."
+
+#~ msgid "rd"
+#~ msgstr "."
+
+#~ msgid "th"
+#~ msgstr "."
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolution har udført automatisk migration af opgaverne fra din "
+#~ "kalendermappe til den nye opgave-mappe."
+
+#~ msgid ""
+#~ "Evolution has tried to take the tasks that were in your calendar folder "
+#~ "and migrate them to the new tasks folder.\n"
+#~ "Some of the tasks could not be migrated, so this process may be attempted "
+#~ "again in the future."
+#~ msgstr ""
+#~ "Evolution har forsøgt at migrere opgaverne, som var i din kalendermappe, "
+#~ "til den nye opgavemappe.\n"
+#~ "Nogle af opgaverne kunne ikke migreres, så denne proces vil blive forsøgt "
+#~ "igen i fremtiden."
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "Kunne ikke åbne '%s'. Ingen elementer fra kalendermappen vil blive "
+#~ "flyttet til opgavemappen."
+
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "Metoden som kræves for at indlæse `%s' er ikke understøttet; ingen "
+#~ "opføringer fra kalendermappen vil blive migreret til opgavemappen."
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Fabrik for import af iCalendar-filer til Evolution"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importerer iCalendar-filer til Evolution"
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importerer vCalendar-filer til Evolution"
+
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr "Kan ikke hente lagerliste fra register: %s"
+
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Kan ikke kalde getFolderAtPath på lager: %s"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Kunne ikke oprette skrivevindue fordi du ikke har sat\n"
+#~ "en identitet op i e-post-komponenten."
+
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Kan ikke initialisere Evolution-redigeringsværktøjet."
+
+#~ msgid "minute"
+#~ msgstr "minut"
+
+#~ msgid "hour"
+#~ msgstr "time"
+
+#~ msgid "week"
+#~ msgstr "uge"
+
+#~ msgid "year"
+#~ msgstr "år"
+
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Konfigurationsværktøj for Evolutions visningsskrifttyper."
+
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Konfigurationsværktøj for Evolutions e-postkonti."
+
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Konfigurationsværktøj for Evolutions e-postkomponent."
+
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Konfigurationsværktøj for Evolutions meddelelsesredigeringsværktøj."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Evolution komponent for håndtering af e-post."
+
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr ""
+#~ "Fabrik for kontrollerne som eksporteres af Evolution-epostkomponenten"
+
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Kan ikke initialisere Evolutions e-postkomponent."
+
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Kan ikke initiere Evolutions konfigurationskomponent for e-post."
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Fabrik for at importere mbox til Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importerer mbox-filer til Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Fabrik for at importere Outlook Express 4-beskeder til Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importerer Outlook Express 4-filer til Evolution"
+
+#~ msgid ""
+#~ "Please specify signature filename\n"
+#~ "in Advanced section of signature settings."
+#~ msgstr ""
+#~ "Angiv filnavn for signaturen i den\n"
+#~ "avancerede del af signaturindstillingerne."
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Skærmskrifttype"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "_Fast bredde:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "_Variabel bredde:"
+
+#~ msgid "All folders"
+#~ msgstr "Alle mapper"
+
+#~ msgid "Apri file"
+#~ msgstr "Apri-fil"
+
+#~ msgid "Display Options"
+#~ msgstr "Visningsalternativer"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Vis mapper med navn som begynder med:"
+
+#~ msgid "Salve file"
+#~ msgstr "Salve-fil"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Konfigurationsværktøj for Evolution-sammenfatningen."
+
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Konfigurationsværktøj for Evolutions mappeindstillinger."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution kunne ikke oprette katalog\n"
+#~ "%s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Directory %s\n"
+#~ "does not have the right permissions. Please make it\n"
+#~ "readable and executable and restart Evolution."
+#~ msgstr ""
+#~ "Katalog %s\n"
+#~ "har ikke korrekte rettigheder. Venligst gør den\n"
+#~ "læsbar og kørbar og start Evolution igen."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "Filen %s\n"
+#~ "bør fjernes for at Evolution skal fungere rigtigt.\n"
+#~ "Venligst fjern denne fil og start Evolution igen."
+
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Kunne ikke starte postassistent-grænsefladen for Evolution\n"
+#~ "(%s)"
+
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Kunne ikke starte postassistent-grænsefladen for Evolution\n"
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Et mappenavn kan ikke indeholde et skråstreg (/)."
+
+#~ msgid "Active connections"
+#~ msgstr "Aktive opkoblinger"
+
+#~ msgid "Host"
+#~ msgstr "Vært"
+
+#~ msgid "Output File"
+#~ msgstr "Uddatafil"
+
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "Pilot_kanalsindstillinger..."
+
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Konfigurér Pilotkanalskonfiguration"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Personlig adressebogs-server"
 
-#~ msgid "Evolution mail folder factory component."
-#~ msgstr "Evolution komponent for e-postmappe fabrik."
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Personlig adressebogs-server; fabrik"
 
 #~ msgid "Factory for the Evolution composer."
 #~ msgstr "Fabrik for Evolution beskedsredigering."
diff --git a/po/de.po b/po/de.po
index 952396af63..e7c495b3b1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.x\n"
-"POT-Creation-Date: 2003-03-28 20:44+0100\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-03-28 20:44+0100\n"
 "Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -23,29 +23,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Fabrik zum Import von LDIF-Dateien in Evolution."
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution-E-Mail-Editor."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Importiert LDIF-Dateien in Evolution."
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Fabrik zum Import von VCard-Dateien in Evolution."
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution-E-Mail-Editor."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importiert VCard-Dateien in Evolution."
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution-E-Mail-Editor."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/backend/ebook/e-card.c:1310
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Einsortieren unter"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/backend/ebook/e-card.c:1324
+#: addressbook/backend/ebook/e-card.c:1315
 #: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
@@ -54,13 +61,13 @@ msgid "Name"
 msgstr "Name"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/backend/ebook/e-card.c:1351
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-Mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Primär"
 
@@ -70,8 +77,8 @@ msgstr "Prim"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1413
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
@@ -79,8 +86,8 @@ msgstr "Assistent"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Geschäftlich"
 
@@ -90,12 +97,12 @@ msgid "Bus"
 msgstr "Geschäftl."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Rückruf"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Firma"
 
@@ -106,13 +113,13 @@ msgstr "Fa."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
-#: addressbook/gui/contact-editor/e-contact-editor.c:1812
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Zu Hause"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1371
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisation"
@@ -123,18 +130,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Geschäftliches Fax"
@@ -144,13 +151,13 @@ msgid "Bus Fax"
 msgstr "Gesch. Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Geschäftlich 2"
 
@@ -159,43 +166,43 @@ msgid "Bus 2"
 msgstr "Geschäft 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Zu Hause 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
-#: addressbook/gui/contact-editor/e-contact-editor.c:1813
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Andere"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Funk"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
@@ -206,15 +213,15 @@ msgid "TTY"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:482
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-Mail 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:492
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-Mail 3"
@@ -238,7 +245,7 @@ msgid "Dep"
 msgstr "Abt"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1385
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Büro"
@@ -248,7 +255,7 @@ msgid "Off"
 msgstr "Büro"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1392
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Titel"
@@ -263,7 +270,7 @@ msgid "Prof"
 msgstr "Beruf"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1406
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Vorgesetzter"
@@ -277,7 +284,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1420
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Spitzname"
@@ -287,19 +294,19 @@ msgid "Nick"
 msgstr "Spitzn."
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1427
+#: addressbook/backend/ebook/e-card.c:1418
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Lebenspartner"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1468
+#: addressbook/backend/ebook/e-card.c:1459
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Notiz"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1447
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "Kalender-URI"
 
@@ -326,7 +333,7 @@ msgid "icsCalendar"
 msgstr "icsCalendar"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1434
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "Jahrestag"
 
@@ -339,7 +346,7 @@ msgid "Birth Date"
 msgstr "Geburtsdatum"
 
 #: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1482
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorien"
@@ -352,105 +359,105 @@ msgstr "Familienname"
 msgid "ECard"
 msgstr "ECard"
 
-#: addressbook/backend/ebook/e-card-simple.c:830
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:891
+#: addressbook/backend/ebook/e-card-simple.c:893
 #: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Namenlose Liste"
 
-#: addressbook/backend/ebook/e-card.c:1317
+#: addressbook/backend/ebook/e-card.c:1308
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:319
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Voller Name"
 
-#: addressbook/backend/ebook/e-card.c:1330
+#: addressbook/backend/ebook/e-card.c:1321
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 msgid "Address"
 msgstr "Adresse"
 
-#: addressbook/backend/ebook/e-card.c:1337
+#: addressbook/backend/ebook/e-card.c:1328
 msgid "Address Label"
 msgstr "Adress-Beschriftung"
 
-#: addressbook/backend/ebook/e-card.c:1344
+#: addressbook/backend/ebook/e-card.c:1335
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/backend/ebook/e-card.c:1358
+#: addressbook/backend/ebook/e-card.c:1349
 msgid "Birth date"
 msgstr "Geburtsdatum"
 
-#: addressbook/backend/ebook/e-card.c:1364
+#: addressbook/backend/ebook/e-card.c:1355
 #: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
-#: addressbook/backend/ebook/e-card.c:1378
+#: addressbook/backend/ebook/e-card.c:1369
 msgid "Organizational Unit"
 msgstr "Organisationseinheit"
 
-#: addressbook/backend/ebook/e-card.c:1399
+#: addressbook/backend/ebook/e-card.c:1390
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Position"
 
-#: addressbook/backend/ebook/e-card.c:1440 mail/mail-format.c:935
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
 msgid "Mailer"
 msgstr "Mailer"
 
-#: addressbook/backend/ebook/e-card.c:1454
+#: addressbook/backend/ebook/e-card.c:1445
 msgid "Free/Busy URL"
 msgstr "Verfügbarkeits-URL"
 
-#: addressbook/backend/ebook/e-card.c:1461
+#: addressbook/backend/ebook/e-card.c:1452
 msgid "ICS Calendar"
 msgstr "ICS-Kalender"
 
 # CHECK
-#: addressbook/backend/ebook/e-card.c:1475
+#: addressbook/backend/ebook/e-card.c:1466
 msgid "Related Contacts"
 msgstr "Verwandte Kontakte"
 
-#: addressbook/backend/ebook/e-card.c:1489
+#: addressbook/backend/ebook/e-card.c:1480
 msgid "Category List"
 msgstr "Liste der Kategorien"
 
-#: addressbook/backend/ebook/e-card.c:1496
+#: addressbook/backend/ebook/e-card.c:1487
 msgid "Wants HTML"
 msgstr "Will HTML"
 
-#: addressbook/backend/ebook/e-card.c:1503
+#: addressbook/backend/ebook/e-card.c:1494
 msgid "Wants HTML set"
 msgstr "Will HTML gesetzt"
 
-#: addressbook/backend/ebook/e-card.c:1510
+#: addressbook/backend/ebook/e-card.c:1501
 msgid "List"
 msgstr "Liste"
 
 # CHECK
-#: addressbook/backend/ebook/e-card.c:1517
+#: addressbook/backend/ebook/e-card.c:1508
 msgid "List Show Addresses"
 msgstr "Liste der Anzeigeadressen"
 
-#: addressbook/backend/ebook/e-card.c:1524
+#: addressbook/backend/ebook/e-card.c:1515
 msgid "Arbitrary"
 msgstr "Beliebig"
 
-#: addressbook/backend/ebook/e-card.c:1531
+#: addressbook/backend/ebook/e-card.c:1522
 msgid "ID"
 msgstr "Kennung"
 
-#: addressbook/backend/ebook/e-card.c:1538
+#: addressbook/backend/ebook/e-card.c:1529
 msgid "Last Use"
 msgstr "Zuletzt verwendet"
 
-#: addressbook/backend/ebook/e-card.c:1549
+#: addressbook/backend/ebook/e-card.c:1540
 msgid "Use Score"
 msgstr "Bewertung verwenden"
 
@@ -502,74 +509,77 @@ msgstr "Abrufen der LDAP-Suchergebnisse..."
 msgid "Error performing search"
 msgstr "Fehler beim Ausführen der Suche"
 
-#: addressbook/conduit/address-conduit.c:296
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Voreingstellte Synchronisationsadresse:"
 
-#: addressbook/conduit/address-conduit.c:539
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor konnte nicht geladen werden\n"
 
-#: addressbook/conduit/address-conduit.c:552
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
-#: addressbook/conduit/address-conduit.c:1373
-#: calendar/conduits/calendar/calendar-conduit.c:1344
-#: calendar/conduits/todo/todo-conduit.c:886
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
-#: addressbook/conduit/address-conduit.c:1374
-#: calendar/conduits/calendar/calendar-conduit.c:1345
-#: calendar/conduits/todo/todo-conduit.c:887
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
 
-#: addressbook/conduit/address-conduit.c:1404
 #: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des konnte Pilot nicht gelesen werden"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Ein Bonobo-Bedienelement für ein Adress-Popup."
+msgid "Configure access to LDAP directory servers here"
+msgstr "Hier können Sie den Zugriff auf LDAP-Verzeichnis-Server konfigurieren"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Ein Bonobo-Bedienelement zur Anzeige einer Adresse."
+msgid "Directory Servers"
+msgstr "Verzeichnis-Server"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Ein Bonobo-Beispiel-Menüelement zur Anzeige eines Adressbuches."
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Evolution-Adressbuch Minikarten-Betrachter"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Konfigurations-Bedienelement zum Speichern des Evolution-Adressbuchs."
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Oberfläche zur Auswahl eines Namens für das Evolution-Adressbuch"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Hier können Sie den Zugriff auf LDAP-Verzeichnis-Server konfigurieren"
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution-Adressbuch Minikarten-Betrachter"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Bedienelement zur Anzeige einer Evolution-Adressbuch-Minikarte."
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution-Adressbuch Minikarten-Betrachter"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "Verzeichnis-Server"
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution-Adressbuch Minikarten-Betrachter"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution-Adressbuch Minikarten-Betrachter"
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution-Test-Komponente"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Evolution-Komponente für den Umgang mit Kontakten."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Factory for the controls exported by the Evolution Addressbook"
-msgstr "Fabrik für die vom Evolution-Adressbuch exportierten Bedienelemente"
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution-Adressbuch Minikarten-Betrachter"
 
 #: addressbook/gui/component/addressbook-component.c:76
 #: addressbook/gui/component/addressbook-component.c:605
@@ -792,7 +802,7 @@ msgstr "Diese Abfrage konnte nicht erfolgreich ausgeführt werden"
 
 #. All, unmatched, separator
 #: addressbook/gui/component/addressbook.c:1089
-#: calendar/gui/cal-search-bar.c:352
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
@@ -805,46 +815,46 @@ msgstr "Die URI, die der Suchdienst anzeigen wird"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr "(keine)"
 
-#: addressbook/gui/component/e-address-popup.c:472
+#: addressbook/gui/component/e-address-popup.c:478
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "Primäre E-Mail"
 
-#: addressbook/gui/component/e-address-popup.c:608
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Eine Aktion wählen"
 
-#: addressbook/gui/component/e-address-popup.c:615
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Einen neuen Kontakt \"%s\" anlegen"
 
-#: addressbook/gui/component/e-address-popup.c:631
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Adresse zu bestehendem Kontakt \"%s\" hinzufügen"
 
-#: addressbook/gui/component/e-address-popup.c:913
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Anfrage beim Adressbuch..."
 
-#: addressbook/gui/component/e-address-popup.c:997
+#: addressbook/gui/component/e-address-popup.c:998
 #: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Kontaktinfo bearbeiten"
 
-#: addressbook/gui/component/e-address-popup.c:1027
+#: addressbook/gui/component/e-address-popup.c:1028
 #: addressbook/gui/component/e-address-widget.c:428
-#: addressbook/gui/component/select-names/e-select-names-popup.c:479
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Zu Kontakten hinzufügen"
 
-#: addressbook/gui/component/e-address-popup.c:1051
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "E-Mail-Adresse einfließen lassen"
 
@@ -980,7 +990,7 @@ msgid "LDAP Configuration Assistant"
 msgstr "LDAP-Konfigurationsassistent"
 
 #: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Nie"
 
@@ -1011,8 +1021,8 @@ msgstr "Suchb_ereich: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:35
-#: calendar/gui/calendar-model.c:1975 calendar/gui/e-day-view.c:1670
-#: calendar/gui/e-week-view.c:1223
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 msgid "Searching"
 msgstr "Suchen"
 
@@ -1311,49 +1321,36 @@ msgid "searching-tab"
 msgstr "searching-tab"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
 msgstr "Oberfläche zur Auswahl eines Namens für das Evolution-Adressbuch"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
-"Fabrik für die Oberfläche zur Auswahl eines Namens für das Evolution-"
-"Adressbuch"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Alle Entfernen"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:162
-#: addressbook/gui/component/select-names/e-select-names.c:698
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
 #: composer/e-msg-composer-attachment-bar.c:502
 #: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Entfernen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:177
-msgid "Remove All"
-msgstr "Alle Entfernen"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:201
-msgid "Send HTML Mail?"
-msgstr "HTML-Mail verschicken?"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:300
-msgid "View Contact Info"
-msgstr "Kontaktinfo anzeigen"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:399
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr "Kontaktliste anzeigen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:417
-msgid "Unnamed Contact List"
-msgstr "Namenlose Kontaktliste"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+msgid "View Contact Info"
+msgstr "Kontaktinfo anzeigen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:434
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d nicht gezeigt)"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
+msgid "Send HTML Mail?"
+msgstr "HTML-Mail verschicken?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:500
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr "Namenloser Kontakt"
 
@@ -1362,11 +1359,11 @@ msgstr "Namenloser Kontakt"
 msgid "Source"
 msgstr "Quelle"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Kontakte aus Adressbuch wählen"
 
-#: addressbook/gui/component/select-names/e-select-names.c:578
+#: addressbook/gui/component/select-names/e-select-names.c:648
 msgid "Find contact in"
 msgstr "Kontakt finden in"
 
@@ -1430,7 +1427,7 @@ msgstr "Zusammenarbeit"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1341
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
@@ -1496,7 +1493,7 @@ msgstr "Wünscht HTML-Mails"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: calendar/gui/dialogs/alarm-page.glade.h:10
 #: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
-#: calendar/gui/e-day-view.c:3720 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
 #: filter/filter.glade.h:15 mail/folder-browser.c:1783
 #: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
 #: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
@@ -1535,10 +1532,10 @@ msgstr "Adresse der _Webseite:"
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
-#: addressbook/gui/widgets/e-minicard-label.c:151
-#: addressbook/gui/widgets/e-minicard-view-widget.c:118
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:473
-#: addressbook/gui/widgets/e-minicard.c:179
+#: addressbook/gui/widgets/e-minicard.c:183
 msgid "Editable"
 msgstr "Editierbar"
 
@@ -2569,7 +2566,7 @@ msgstr "Simbabwe"
 #: addressbook/gui/widgets/e-addressbook-model.c:304
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:104
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:459
 msgid "Book"
 msgstr "Buch"
@@ -2577,7 +2574,7 @@ msgstr "Buch"
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
 #: addressbook/gui/widgets/e-minicard-widget.c:93
-#: addressbook/gui/widgets/e-minicard.c:186
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr "Karte"
 
@@ -2593,19 +2590,19 @@ msgstr "Beschreibbare Felder"
 msgid "Changed"
 msgstr "Geändert"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:834
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Der Kategorie-Editor ist nicht verfügbar."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:842
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "Dieser Kontakt gehört in folgende Kategorien:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1016
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Kontakt als VCard speichern"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1062
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2613,7 +2610,7 @@ msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diese Kontakte löschen wollen?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1065
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2621,11 +2618,11 @@ msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diesen Kontakt löschen wollen?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2368
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Widget für ein Feld konnte nicht gefunden werden: '%s'"
@@ -2881,7 +2878,7 @@ msgstr "%d Karten"
 #: addressbook/gui/widgets/e-addressbook-model.c:311
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:111
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:466
 msgid "Query"
 msgstr "Abfrage"
@@ -2896,20 +2893,21 @@ msgstr "Modell"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:105
-#: addressbook/gui/widgets/e-minicard.c:515
+#: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Erfolg"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:522 shell/e-shell.c:2077
-#: shell/e-storage.c:602 shell/evolution-shell-component.c:1202
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -2918,7 +2916,7 @@ msgid "Repository offline"
 msgstr "Repository offline"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
@@ -2935,7 +2933,7 @@ msgid "Protocol not supported"
 msgstr "Protokoll nicht unterstützt"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1176
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
 #: camel/camel-service.c:737 camel/camel-service.c:779
@@ -3132,7 +3130,7 @@ msgid "Delete"
 msgstr "Löschen"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:904
-#: calendar/gui/e-day-view.c:3680 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 msgid "Current View"
 msgstr "Aktuelle Ansicht"
 
@@ -3237,38 +3235,38 @@ msgstr "und eine andere Karte."
 msgid "Save in addressbook"
 msgstr "In Adressbuch speichern"
 
-#: addressbook/gui/widgets/e-minicard-label.c:102
-#: addressbook/gui/widgets/e-minicard.c:142
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
 msgid "Width"
 msgstr "Breite"
 
-#: addressbook/gui/widgets/e-minicard-label.c:109
-#: addressbook/gui/widgets/e-minicard.c:149
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
 msgid "Height"
 msgstr "Höhe"
 
-#: addressbook/gui/widgets/e-minicard-label.c:116
-#: addressbook/gui/widgets/e-minicard.c:157
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
 msgid "Has Focus"
 msgstr "Hat den Fokus"
 
-#: addressbook/gui/widgets/e-minicard-label.c:123
+#: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Feld"
 
-#: addressbook/gui/widgets/e-minicard-label.c:130
+#: addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Name des Feldes"
 
-#: addressbook/gui/widgets/e-minicard-label.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Textmodell"
 
-#: addressbook/gui/widgets/e-minicard-label.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Maximale Länge des Feldnamens"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Spaltenbreite"
 
@@ -3300,11 +3298,11 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:165
+#: addressbook/gui/widgets/e-minicard.c:169
 msgid "Selected"
 msgstr "Ausgewählt"
 
-#: addressbook/gui/widgets/e-minicard.c:172
+#: addressbook/gui/widgets/e-minicard.c:176
 msgid "Has Cursor"
 msgstr "Hat Cursor"
 
@@ -3634,7 +3632,7 @@ msgid "High"
 msgstr "Hoch"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/calendar-model.c:1704
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
@@ -3653,73 +3651,77 @@ msgstr "Niedrig"
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: calendar/conduits/calendar/calendar-conduit.c:208
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Mehrtätige Ereignisse aufteilen:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1291
-#: calendar/conduits/todo/todo-conduit.c:832
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1442
-#: calendar/conduits/calendar/calendar-conduit.c:1445
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/conduits/todo/todo-conduit.c:208
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Vorgabepriorität:"
 
-#: calendar/conduits/todo/todo-conduit.c:956
-#: calendar/conduits/todo/todo-conduit.c:959
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Ein Bonobo-Bedienelement zur Anzeige einer Aufgabenliste."
+msgid "Calendar and Tasks"
+msgstr "Kalender und Aufgaben"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Ein Bonobo-Beispiel-Bedienelement zur Anzeige eines Kalenders"
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+"Hier können Sie Ihre Zeitzone, den Kalender und die Aufgabenliste "
+"konfigurieren"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
 msgstr "Kalender und Aufgaben"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Konfigurations-Bedienelement für den Evolution-Kalender."
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution-Komponente zur Anzeige von E-Mail-Ordnern."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-"Hier können Sie Ihre Zeitzone, den Kalender und die Aufgabenliste "
-"konfigurieren"
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution-Mailordner-Fabrik-Komponente."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
 msgstr "Evolution Kelender iTip/iMip-Betrachter"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution-Komponente für den Umgang mit E-Mails."
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution Kelender iTip/iMip-Betrachter"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Fabrik für die Kalender-Objekte von Evolution"
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Kelender iTip/iMip-Betrachter"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Fabrik zur Zentralisierung der Dialoge des Kalender-Komponenteneditors"
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution-Alarm"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Alarm notification service"
-msgstr "Alarm-Benachrichtigungsdienst"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:2
-msgid "Factory for the alarm notification service"
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
 msgstr "Fabrik für den Alarm-Benachrichtigungsdienst."
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
@@ -3824,7 +3826,7 @@ msgstr "Beschreibung enthält"
 msgid "Comment contains"
 msgstr "Kommentar enthält"
 
-#: calendar/gui/cal-search-bar.c:356 mail/mail-ops.c:1106
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr "Nicht passend"
 
@@ -3834,8 +3836,8 @@ msgstr "%A, %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:312
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
@@ -3853,7 +3855,7 @@ msgstr "%d. %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:432
-#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1513
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d. %B"
 
@@ -3885,7 +3887,7 @@ msgstr "Öffentlicher Ordner mit Kontaktinformationen"
 
 #: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
 #: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
-#: calendar/importers/icalendar-importer.c:595
+#: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
 #: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
@@ -3952,12 +3954,12 @@ msgstr "Ganz_tags-Termin"
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztätigen Termin anlegen"
 
-#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:956
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
 #: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:958
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
 #: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Vertraulich"
@@ -3982,37 +3984,37 @@ msgstr "O"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1126
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
 #: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "Frei"
 
 #: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
-#: calendar/gui/e-meeting-time-sel.c:408
-#: shell/evolution-shell-component.c:1187
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: calendar/gui/calendar-model.c:742 calendar/gui/calendar-model.c:1170
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "Nicht gestartet"
 
-#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1172
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1174
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: calendar/gui/calendar-model.c:1028
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4023,32 +4025,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1168 calendar/gui/dialogs/meeting-page.c:322
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1982
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
 #: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
 #: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
 #: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "Keine"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
 #: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
 #: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
 #: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Nein"
@@ -4086,31 +4088,31 @@ msgstr "Erlaubnis zum Öffnen des Kalenders verweigert"
 msgid "Could not open the folder in '%s'"
 msgstr "Der Ordner in '%s' konnte nicht geöffnet werden"
 
-#: calendar/gui/control-factory.c:163
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
 
-#: calendar/gui/control-factory.c:170
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Typ der anzuzeigenden Ansicht"
 
-#: calendar/gui/dialogs/alarm-options.c:473
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Audio-Alarmoptionen"
 
-#: calendar/gui/dialogs/alarm-options.c:482
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Nachrichten-Alarmoptionen"
 
-#: calendar/gui/dialogs/alarm-options.c:491
+#: calendar/gui/dialogs/alarm-options.c:438
 msgid "Email Alarm Options"
 msgstr "E-Mail-Alarmoptionen"
 
-#: calendar/gui/dialogs/alarm-options.c:500
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Programm-Alarmoptionen"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Unbekannte Alarmoptionen"
 
@@ -4151,14 +4153,19 @@ msgid "days"
 msgstr "Tage"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr "Dialog1"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "weitere Male alle"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12 filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "Stunden"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "Minuten"
 
@@ -4223,7 +4230,7 @@ msgstr "Ende des Termins"
 msgid "hour(s)"
 msgstr "Stunde(n)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -4403,7 +4410,7 @@ msgid "_Fri"
 msgstr "_Fr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Allgemein"
 
@@ -4595,8 +4602,8 @@ msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
 #: calendar/gui/dialogs/comp-editor.c:1230
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3938
-#: calendar/gui/e-week-view.c:3760 composer/e-msg-composer.c:1159
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr "Speichern unter..."
 
@@ -4691,19 +4698,19 @@ msgstr "Planung"
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: calendar/gui/dialogs/event-page.c:654 calendar/gui/dialogs/task-page.c:554
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
-#: calendar/gui/dialogs/event-page.c:664
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "Das Enddatum ist falsch"
 
-#: calendar/gui/dialogs/event-page.c:687
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "Die Anfangszeit ist falsch"
 
-#: calendar/gui/dialogs/event-page.c:694
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "Die Endzeit ist falsch"
 
@@ -4760,15 +4767,10 @@ msgid "Su_mmary:"
 msgstr "Zusammenfassung:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "Kontakte..."
-
-#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "_Endzeit:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "Anfangszeit:"
 
@@ -4828,7 +4830,7 @@ msgid "Member"
 msgstr "Mitglied"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
@@ -4850,7 +4852,7 @@ msgid "_Change Organizer"
 msgstr "Organisator _ändern"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr "Andere einladen..."
 
@@ -5061,7 +5063,7 @@ msgstr "Arbeitsauftrag"
 msgid "Due date is wrong"
 msgstr "Das Fälligkeitsdatum ist falsch"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1104
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
@@ -5071,6 +5073,10 @@ msgstr "Beschreibung:"
 msgid "Sta_rt Date:"
 msgstr "Anfangsdatum:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "Kontakte..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Fällig am:"
@@ -5169,56 +5175,67 @@ msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
 
 #: calendar/gui/e-calendar-table.c:415
+#, c-format
 msgid "0%"
 msgstr "0%"
 
 #: calendar/gui/e-calendar-table.c:416
+#, c-format
 msgid "10%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:417
+#, c-format
 msgid "20%"
 msgstr "20%"
 
 #: calendar/gui/e-calendar-table.c:418
+#, c-format
 msgid "30%"
 msgstr "30%"
 
 #: calendar/gui/e-calendar-table.c:419
+#, c-format
 msgid "40%"
 msgstr "40%"
 
 #: calendar/gui/e-calendar-table.c:420
+#, c-format
 msgid "50%"
 msgstr "50%"
 
 #: calendar/gui/e-calendar-table.c:421
+#, c-format
 msgid "60%"
 msgstr "60%"
 
 #: calendar/gui/e-calendar-table.c:422
+#, c-format
 msgid "70%"
 msgstr "70%"
 
 #: calendar/gui/e-calendar-table.c:423
+#, c-format
 msgid "80%"
 msgstr "80%"
 
 #: calendar/gui/e-calendar-table.c:424
+#, c-format
 msgid "90%"
 msgstr "90%"
 
 #: calendar/gui/e-calendar-table.c:425
+#, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2825
-#: calendar/gui/e-week-view.c:1900
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1910
 msgid "Deleting selected objects"
 msgstr "Markierte Objekte werden gelöscht"
 
-#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3702
-#: calendar/gui/e-week-view.c:3541 mail/folder-browser.c:1756
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
 #: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Ö_ffnen"
@@ -5227,30 +5244,30 @@ msgstr "Ö_ffnen"
 msgid "_Save as..."
 msgstr "_Speichern unter..."
 
-#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3704
-#: calendar/gui/e-week-view.c:3516 calendar/gui/e-week-view.c:3543
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3709
-#: calendar/gui/e-week-view.c:3548 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Ausschneiden"
 
-#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3710
-#: calendar/gui/e-week-view.c:3549 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3675
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3520
-#: calendar/gui/e-week-view.c:3550 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5276,8 +5293,8 @@ msgstr "Markierte Aufgaben als abgeschlossen _markieren"
 msgid "_Delete Selected Tasks"
 msgstr "Markierte Aufgaben _löschen"
 
-#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7641
-#: calendar/gui/e-week-view.c:4249
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
@@ -5320,7 +5337,7 @@ msgid "Start Date"
 msgstr "Anfangsdatum"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:56 shell/e-shell.c:747
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Zusammenfassung"
@@ -5352,22 +5369,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:531
+#: calendar/gui/e-day-view-time-item.c:529
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:262 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:303 calendar/gui/print.c:1529
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:270 calendar/gui/e-day-view.c:1401
-#: calendar/gui/e-week-view-main-item.c:326
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr "%d. %b"
 
@@ -5383,67 +5400,67 @@ msgstr "AM"
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:3659
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Neuer _Termin"
 
-#: calendar/gui/e-day-view.c:3661 calendar/gui/e-week-view.c:3510
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "Neues ganztägiges _Ereignis"
 
-#: calendar/gui/e-day-view.c:3663 calendar/gui/e-week-view.c:3511
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/e-day-view.c:3665 calendar/gui/e-week-view.c:3512
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/e-day-view.c:3670 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Drucken..."
 
-#: calendar/gui/e-day-view.c:3682 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3684 calendar/gui/e-week-view.c:3527
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3689 calendar/gui/e-week-view.c:3531
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen _veröffentlichen"
 
-#: calendar/gui/e-day-view.c:3694 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Einstellungen..."
 
-#: calendar/gui/e-day-view.c:3703 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
 #: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen..."
 
-#: calendar/gui/e-day-view.c:3716 calendar/gui/e-week-view.c:3555
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten..."
 
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3560
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten _beweglich machen"
 
-#: calendar/gui/e-day-view.c:3722 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr "Dieses _Auftreten löschen"
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr "Jedes _Auftreten löschen"
 
@@ -5564,31 +5581,31 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Keine</i>"
 
-#: calendar/gui/e-itip-control.c:1058
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Standort: "
 
-#: calendar/gui/e-itip-control.c:1072
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
 #: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
-#: calendar/gui/itip-utils.c:413
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: calendar/gui/e-itip-control.c:1081 calendar/gui/itip-utils.c:416
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
-#: calendar/gui/e-itip-control.c:1085 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
-#: calendar/gui/itip-utils.c:419 calendar/gui/itip-utils.c:445
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
 #: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
 #: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
 #: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
@@ -5600,302 +5617,302 @@ msgstr "Abgelehnt"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: calendar/gui/e-itip-control.c:1144 calendar/gui/e-itip-control.c:1172
-#: calendar/gui/e-itip-control.c:1198 calendar/gui/e-itip-control.c:1211
-#: calendar/gui/e-itip-control.c:1224 calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 msgid "Choose an action:"
 msgstr "Eine Aktion wählen:"
 
-#: calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: calendar/gui/e-itip-control.c:1146 calendar/gui/e-itip-control.c:1177
-#: calendar/gui/e-itip-control.c:1200 calendar/gui/e-itip-control.c:1213
-#: calendar/gui/e-itip-control.c:1226 calendar/gui/e-itip-control.c:1239
-#: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Annehmen"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Vorläufig annehmen"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Neueste Informationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:1238 calendar/gui/itip-utils.c:433
-#: shell/evolution-shell-component.c:1165 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> hat Besprechungsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> wünscht die Anwesenheit von %s bei einer Besprechung"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> wünscht Ihre Anwesenheit bei einer Besprechung"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wünscht zu einer vorhandenen Besprechung hinzuzufügen"
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wünscht aktuelle Besprechungsinformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1345
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> hat auf eine Besprechungsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: calendar/gui/e-itip-control.c:1353
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> hat eine Besprechung widerrufen."
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Besprechungswiderruf"
 
-#: calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1428
-#: calendar/gui/e-itip-control.c:1463
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hat eine unverständliche Nachricht verschickt."
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> hat Aufgabeninformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> fordert %s auf, eine Aufgabe auszuführen."
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> fordert Sie auf eine Aufgabe auszuführen."
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
-#: calendar/gui/e-itip-control.c:1399
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzuzufügen."
 
-#: calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1404
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wünscht letzte Aufgabeninformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1412
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> hat auf eine Aufgabenzuweisung geantwortet."
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: calendar/gui/e-itip-control.c:1420
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> hat eine Aufgabe widerrufen."
 
-#: calendar/gui/e-itip-control.c:1421
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Aufgabenwiderruf"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: calendar/gui/e-itip-control.c:1448
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> hat Verfügbarkeitsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1449
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: calendar/gui/e-itip-control.c:1453
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> fordert Ihre Verfügbarkeitsinformationen an."
 
-#: calendar/gui/e-itip-control.c:1454
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Verfügbarkeitsanfrage"
 
-#: calendar/gui/e-itip-control.c:1458
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> hat auf eine Verfugbarkeitsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Verfügbarkeitsantwort"
 
-#: calendar/gui/e-itip-control.c:1464
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verfügbarkeitsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1540
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enthält ausschließlich nicht unterstützte Anfragen."
 
-#: calendar/gui/e-itip-control.c:1634 calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Die Anlage enthält keine gültige Kalendernachricht"
 
-#: calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalenderinformationen"
 
-#: calendar/gui/e-itip-control.c:1906 calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt ist ungültig und konnte nicht aktualisiert werden\n"
 
-#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 msgid "There was an error on the CORBA system\n"
 msgstr "Es trat ein Fehler im CORBA-System auf\n"
 
-#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 msgid "Object could not be found\n"
 msgstr "Objekt konnte nicht gefunden werden\n"
 
-#: calendar/gui/e-itip-control.c:1915
+#: calendar/gui/e-itip-control.c:1916
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
 "Sie haben nicht die nötige Berechtigung, um den Kalender zu aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1950 calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Anwesenheitsstatus konnte nicht aktualisiert werden, da der Eintrag nicht "
 "mehr existiert"
 
-#: calendar/gui/e-itip-control.c:1971
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Diese Antwort ist von keinem Teilnehmer.  Als Teilnehmer hinzufügen?"
 
-#: calendar/gui/e-itip-control.c:1983
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Anwesenheitsstatus konnte auf Grund eines ungültigen Status nicht "
 "aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:2007
+#: calendar/gui/e-itip-control.c:2008
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "Sie haben nicht die nötige Berechtigung, um den Kalender zu aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Anwesenheitsstatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Teilnehmerstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:2048
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:2078 calendar/gui/e-itip-control.c:2128
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:2080 calendar/gui/e-itip-control.c:2132
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: calendar/gui/e-itip-control.c:2205
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Ordner für Kalender wählen"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Ordner für Aufgaben wählen"
 
@@ -5998,7 +6015,7 @@ msgid "Needs Action"
 msgstr "Erfordert Maßnahme"
 
 #: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
-#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:407
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr "Vorläufig"
 
@@ -6014,14 +6031,14 @@ msgstr "In Bearbeitung"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2077
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2107 e-util/e-time-utils.c:189
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
 #: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
@@ -6033,63 +6050,63 @@ msgstr "%a, %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:409 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Außer Haus"
 
-#: calendar/gui/e-meeting-time-sel.c:410
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Keine Information"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "Optionen"
 
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Nur Arbeitszeit anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Weggezoomt anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "<<"
 
-#: calendar/gui/e-meeting-time-sel.c:535
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr "AutoWahl"
 
-#: calendar/gui/e-meeting-time-sel.c:549
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ">>"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr "Alle Leute und Ressourcen"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Alle Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "Benötigte Leute"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Benötigte Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:630
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Anfang der Besprechung:"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Ende der Besprechung:"
 
@@ -6135,7 +6152,7 @@ msgstr "Markierte Objekte werden gelöscht..."
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: calendar/gui/e-week-view.c:3509
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Neuer _Termin..."
 
@@ -6243,58 +6260,58 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:262 calendar/gui/itip-utils.c:310
-#: calendar/gui/itip-utils.c:342
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr "Es muss ein Organisator festgelegt werden."
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Es ist mindestens ein Teilnehmer erforderlich"
 
-#: calendar/gui/itip-utils.c:385 calendar/gui/itip-utils.c:494
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "Ereignisinformationen"
 
-#: calendar/gui/itip-utils.c:387 calendar/gui/itip-utils.c:496
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/itip-utils.c:389 calendar/gui/itip-utils.c:498
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "Journalinformationen"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Kalenderinformationen"
 
-#: calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Aktualisieren"
 
 # CHECK
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Gegenvorschlag"
 
-#: calendar/gui/itip-utils.c:512
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Verfügbarkeitsinformationen (%s bis %s)"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "iCalendar-Informationen"
 
-#: calendar/gui/itip-utils.c:672
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
@@ -6394,7 +6411,7 @@ msgstr "Kontakte: "
 
 #: calendar/gui/print.c:2533 calendar/gui/print.c:2619
 #: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:617
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
@@ -6431,31 +6448,43 @@ msgstr "Mich nicht mehr fragen."
 msgid "Print Tasks"
 msgstr "Aufgaben drucken"
 
-#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:379
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
 msgid "SMTWTFS"
 msgstr "SMDMDFS"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Fabrik zum Import von iCalendar-Dateien in Evolution"
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution Kelender iTip/iMip-Betrachter"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Importiert iCalendar-Dateien in Evolution"
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Evolution Kelender iTip/iMip-Betrachter"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Importiert vCalendar-Dateien in Evolution"
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Evolution Kelender iTip/iMip-Betrachter"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Kalendermitteilung"
 
-#: calendar/importers/icalendar-importer.c:380
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
 msgstr "Erinnerung!!"
 
-#: calendar/importers/icalendar-importer.c:588
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Kalender-Ereignisse"
 
-#: calendar/importers/icalendar-importer.c:613
+#: calendar/importers/icalendar-importer.c:663
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6463,7 +6492,7 @@ msgstr ""
 "Evolution hat Gnome Calendar-Dateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: calendar/importers/icalendar-importer.c:620
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -8707,7 +8736,7 @@ msgstr ""
 "Die Berechtigungsnachweise, auf die Bezug genommen wurde, sind ausgelaufen."
 
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
-#: camel/camel-sasl-gssapi.c:272 camel/camel-sasl-gssapi.c:287
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
 #: camel/providers/imap/camel-imap-store.c:1052
 msgid "Bad authentication response from server."
@@ -8718,7 +8747,7 @@ msgstr "Ungültige Legitimationsantwort vom Server."
 msgid "Failed to resolve host `%s': %s"
 msgstr "Rechnername »%s« konnte nicht aufgelöst werden: %s"
 
-#: camel/camel-sasl-gssapi.c:295
+#: camel/camel-sasl-gssapi.c:299
 msgid "Unsupported security layer."
 msgstr "Nicht unterstützte Sicherheitsebene."
 
@@ -9295,7 +9324,7 @@ msgstr "Nach neuen E-Mails sehen"
 msgid "Check for new messages in all folders"
 msgstr "In allen Ordnern nach neuen E-Mails sehen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1185
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "Ordner"
 
@@ -10097,7 +10126,7 @@ msgstr ""
 "Verbindung mit POP-Server %s konnte nicht hergestellt werden.\n"
 "Fehler beim Übermitteln des Passworts: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:623
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
@@ -10522,39 +10551,39 @@ msgstr "Antwort an:"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:521
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Von:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:527
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:536
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "An:"
 
-#: composer/e-msg-composer-hdrs.c:537
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Geben Sie die Empfänger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:540
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Kopie an:"
 
-#: composer/e-msg-composer-hdrs.c:541
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
 
-#: composer/e-msg-composer-hdrs.c:544
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Blindkopie an:"
 
-#: composer/e-msg-composer-hdrs.c:545
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10565,11 +10594,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Ablegen in:"
 
-#: composer/e-msg-composer-hdrs.c:554
+#: composer/e-msg-composer-hdrs.c:549
 msgid "Posting destination"
 msgstr "Zielordner"
 
@@ -10578,11 +10607,11 @@ msgstr "Zielordner"
 msgid "Attach file(s)"
 msgstr "Datei(en) beilegen"
 
-#: composer/e-msg-composer.c:530
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "Es konnte kein PGP-Signaturkontext angelegt werden"
 
-#: composer/e-msg-composer.c:809
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10591,30 +10620,30 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, überschreiben?"
 
-#: composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:1213
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10623,7 +10652,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1270
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10632,7 +10661,7 @@ msgstr ""
 "Datei konnte nicht verkürzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1279
+#: composer/e-msg-composer.c:1285
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10641,7 +10670,7 @@ msgstr ""
 "Dateideskriptor %s konnte nicht kopiert werden:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10650,7 +10679,7 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1382
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10659,7 +10688,7 @@ msgstr ""
 "entdeckt.\n"
 "Möchten Sie eine Wiederherstellung versuchen?"
 
-#: composer/e-msg-composer.c:1544
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10671,32 +10700,32 @@ msgstr ""
 "Wollen Sie die Änderungen speichern?"
 
 # CHECK
-#: composer/e-msg-composer.c:1549
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "Änderungen verwerfen"
 
-#: composer/e-msg-composer.c:1553
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Warnung: Geänderte Nachricht"
 
-#: composer/e-msg-composer.c:1585
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:1943
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1254
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr "Automatisch erzeugt"
 
-#: composer/e-msg-composer.c:2162 composer/e-msg-composer.c:2758
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "Eine Nachricht verfassen"
 
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10704,7 +10733,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "Adresswähler-Control konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:2816
+#: composer/e-msg-composer.c:2931
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10716,7 +10745,7 @@ msgstr ""
 "Bitte stellen Sie sicher, dass die korrekte gtkhtml- und\n"
 "libgtkhtml-Version installiert ist.\n"
 
-#: composer/e-msg-composer.c:2876
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10724,7 +10753,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:3889
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10905,11 +10934,11 @@ msgstr ""
 msgid "Overwrite file?"
 msgstr "Datei überschreiben?"
 
-#: e-util/e-passwords.c:345
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Dieses Passwort speichern"
 
-#: e-util/e-passwords.c:347
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Passwort erinnern"
 
@@ -11132,31 +11161,31 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1275
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
 msgid "Important"
 msgstr "Wichtig"
 
 #. red
 #: filter/filter-label.c:122 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1276
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 msgid "Work"
 msgstr "Arbeit"
 
 #. orange
 #: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
-#: shell/e-config-upgrade.c:1277
+#: shell/e-config-upgrade.c:1281
 msgid "Personal"
 msgstr "Persönlich"
 
 #. forest green
 #: filter/filter-label.c:124 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1278
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 msgid "To Do"
 msgstr "Zu erledigen"
 
 #. blue
 #: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
-#: shell/e-config-upgrade.c:1279
+#: shell/e-config-upgrade.c:1283
 msgid "Later"
 msgstr "Später"
 
@@ -11262,7 +11291,7 @@ msgstr "in der Vergangenheit"
 msgid "months"
 msgstr "Monate"
 
-#: filter/filter.glade.h:24 mail/mail-config.glade.h:181
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -11604,8 +11633,8 @@ msgid "Scanning %s"
 msgstr "%s wird abgetastet"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:114
-#: mail/folder-browser-ui.c:357 mail/importers/elm-importer.c:526
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
 #: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
 msgstr "E-Mail"
@@ -11752,62 +11781,70 @@ msgid "Composer Preferences"
 msgstr "Editor-Einstellungen"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr ""
-"Konfigurations-Bedienelement für die von Evolution verwendeten Schriftarten."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Konfigurations-Bedienelement für die Evolution E-Mail-Konten."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Konfigurations-Bedienelement für den Evolution-Mailer."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Konfigurations-Bedienelement für den Evolution Nachrichten-Editor."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit und "
 "der Anzeige von Nachrichten festlegen"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 "Hier können Sie die Rechtschreibprüfung, Signaturen sowie den "
 "Nachrichteneditor konfigurieren"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure the fonts used by Evolution here"
 msgstr "Hier können Sie die von Evolution verwendeten Schriften konfigurieren"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr "Hier können Sie Ihre E-Mail-Konten konfigurieren"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution-Konteneditor"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolution-E-Mail-Editor."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution-E-Mail-Editor."
+
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Evolution-Komponente für den Umgang mit E-Mail."
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution-E-Mail-Editor."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Evolution-E-Mail-Editor."
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "E-Mail-Konfigurationsoberfläche"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Evolutions E-Mail-Chefsesselansicht-Komponente."
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution-Komponente zur Anzeige von E-Mail-Ordnern."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Evolution-Komponente zur Anzeige von E-Mail-Ordnern."
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Evolution-Mailordner-Fabrik-Komponente."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr "Fabrik für die vom Evolution-Mailer exportierten Steuerungen"
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolutions E-Mail-Chefsesselansicht-Komponente."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
@@ -11821,43 +11858,39 @@ msgstr "E-Mail-Konten"
 msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "E-Mail-Konfigurationsoberfläche"
-
-#: mail/component-factory.c:114
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Ordner, der E-Mails enthält"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Öffentliche E-Mail"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Öffentlicher Ordner, der E-Mails enthält"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Virtueller Müll"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Virtueller Müllordner"
 
-#: mail/component-factory.c:144
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Eigenschaften..."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: mail/component-factory.c:816
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11865,55 +11898,55 @@ msgstr ""
 "Einige Ihrer E-Mail-Einstellungen scheinen ungültig zu sein, bitte stellen "
 "Sie sicher, dass alles in Ordnung ist."
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Sie haben keine Methode für den Transport von E-Mails eingestellt"
 
-#: mail/component-factory.c:1016
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Es sind noch nicht verschickte Nachrichten vorhanden. Wollen Sie Evolution "
 "dennoch beenden?"
 
-#: mail/component-factory.c:1056
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Neue E-Mail-Nachricht"
 
-#: mail/component-factory.c:1056
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "Nachricht _verschicken"
 
-#: mail/component-factory.c:1057
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: mail/component-factory.c:1065
+#: mail/component-factory.c:1069
 msgid "New Message Post"
 msgstr "Neue Ordner-Nachricht"
 
 # CHECK
-#: mail/component-factory.c:1065
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr "_Ordner-Nachricht"
 
-#: mail/component-factory.c:1066
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "Eine neue E-Mail-Nachricht für einen Ordner verfassen"
 
-#: mail/component-factory.c:1349
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "Verbindung wird hergestellt..."
 
-#: mail/component-factory.c:1360
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Speicher konnte nicht bei der Shell registriert werden"
 
-#: mail/folder-browser-ui.c:483
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenschaften von \"%s\""
 
-#: mail/folder-browser-ui.c:485
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Eigenschaften"
 
@@ -12097,22 +12130,37 @@ msgstr "Vorgabe"
 msgid "Getting Folder Information"
 msgstr "Ordner-Informationen werden entnommen"
 
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution-E-Mail-Editor."
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Fabrik, zum Import von mbox-Dateien in Evolution."
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution-E-Mail-Editor."
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importiert mbox-Dateien in Evolution."
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution-E-Mail-Editor."
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
-"Fabrik zum Import von mit Outlook Express 4 erstellten E-Mails in Evolution."
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importiert Outlook-Express-4-Dateien in Evolution."
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolution-E-Mail-Editor."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12158,7 +12206,7 @@ msgstr "Sie haben nicht alle erforderlichen Felder ausgefüllt."
 msgid "Evolution Account Editor"
 msgstr "Evolution-Konteneditor"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Rechner:"
 
@@ -12166,7 +12214,7 @@ msgstr "_Rechner:"
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_Pfad:"
 
@@ -12183,12 +12231,12 @@ msgid "Don't delete"
 msgstr "Nicht löschen"
 
 #: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr "Deaktivieren"
 
 #: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr "Aktivieren"
 
@@ -12198,7 +12246,7 @@ msgid "[Default]"
 msgstr "[Vorgabe]"
 
 #: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:680 mail/mail-composer-prefs.c:836
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr "Aktiv"
 
@@ -12458,35 +12506,35 @@ msgstr "Nachricht drucken"
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-callbacks.c:3146
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle %d Nachrichten in getrennten Fenstern öffnen "
 "wollen?"
 
-#: mail/mail-composer-prefs.c:225 mail/mail-composer-prefs.c:328
-#: mail/mail-config.c:1220
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
 msgid "Unnamed"
 msgstr "Namenlose"
 
-#: mail/mail-composer-prefs.c:313
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr "Sie müssen einen gültigen Namen für das Skript angeben."
 
-#: mail/mail-composer-prefs.c:369 mail/mail-composer-prefs.c:431
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
 msgid "[script]"
 msgstr "[Skript]"
 
-#: mail/mail-composer-prefs.c:840
+#: mail/mail-composer-prefs.c:864
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
-#: mail/mail-composer-prefs.c:882
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Skript-Signatur hinzufügen"
 
-#: mail/mail-composer-prefs.c:902
+#: mail/mail-composer-prefs.c:926
 msgid "Signature(s)"
 msgstr "Signatur(en)"
 
@@ -12555,11 +12603,11 @@ msgstr ""
 "dieses Konto ein.\n"
 "Dieser Name wird nur zur Anzeige auf dem Bildschirm verwendet."
 
-#: mail/mail-config.c:924
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Dienst wird überprüft"
 
-#: mail/mail-config.c:1002 mail/mail-config.c:1006
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "Verbindung zu Server..."
 
@@ -12810,14 +12858,19 @@ msgid "Message Display"
 msgstr "Nachrichtenanzeige"
 
 #: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Nachricht enthält"
+
+#: mail/mail-config.glade.h:76
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "E-Mail-Benachrichtigung"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12825,10 +12878,6 @@ msgstr ""
 "Hinweis: Sie werden erst nach dem Passwort gefragt, wenn Sie das erste Mal "
 "eine Verbindung mit dem Server aufbauen"
 
-#: mail/mail-config.glade.h:80
-msgid "On Screen fonts"
-msgstr "Bildschirmschriftarten"
-
 #: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Optionale Information"
@@ -13066,104 +13115,110 @@ msgid "_Enable"
 msgstr "_Aktivieren"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr "_Feste Breite:"
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Voller Name:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "_HTML-Mail"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_Identität"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "Bilder _laden, falls Absender im Adressbuch ist"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "Dies zu meinem _Vorgabekonto machen"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Name:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "Bilder _nie aus dem Netz laden"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "Beim Eintreffen neuer E-Mail _Klangdatei abspielen"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Beim Abschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "_nachfragen"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Beim Abschicken von Nachrichten mit _leerem Betreff nachfragen"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Abrufen von E-Mail"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "Vorgaben _wiederherstellen"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Verschicken von E-Mail"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Animierte Bilder zeigen"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Signaturen"
 
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Sand Point"
+
 #: mail/mail-config.glade.h:175
-msgid "_Use secure connection (SSL):"
-msgstr "Sichere Verbindung (_SSL) verwenden:"
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Ursprünglicher Kontakt:"
 
 #: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "_Variable Breite:"
+msgid "_Use secure connection (SSL):"
+msgstr "Sichere Verbindung (_SSL) verwenden:"
 
 #: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "_alle"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "Farbe"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "Beschreibung"
 
@@ -13247,19 +13302,19 @@ msgstr "Überfallig:"
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "am %d. %B %Y, %H:%M"
 
-#: mail/mail-display.c:2234
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Link in Browser öffnen"
 
-#: mail/mail-display.c:2235
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Linkziel kopieren"
 
-#: mail/mail-display.c:2237
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Link speichern unter (FIXME)"
 
-#: mail/mail-display.c:2239
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Bild speichern unter..."
 
@@ -13804,31 +13859,31 @@ msgstr "Höher"
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: mail/message-list.c:1076
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1112
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %H.%M"
 
-#: mail/message-list.c:1114
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2610
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Erzeugen der Nachrichtenliste"
 
@@ -13926,40 +13981,40 @@ msgstr "_Fällig am:"
 msgid "_Flag:"
 msgstr "_Markierung:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Ordner unter %s auf \"%s\" werden abgetastet"
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Ordner der obersten Ebene auf \"%s\" werden abgetastet"
 
-#: mail/subscribe-dialog.c:331
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Ordner \"%s\" wird abonniert"
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abonnement auf Ordner \"%s\" wird abbestellt"
 
-#: mail/subscribe-dialog.c:1246 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Ordner"
 
-#: mail/subscribe-dialog.c:1356
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Ordner werden abgetastet..."
 
-#: mail/subscribe-dialog.c:1470
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gewählt"
 
-#: mail/subscribe-dialog.c:1545
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Bitte wählen Sie einen Server."
 
@@ -13993,18 +14048,25 @@ msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configuration control for the Evolution Summary."
-msgstr "Konfigurations-Bedienelement für die Evolution-Zusammenfassung."
-
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Hier können Sie das Erscheinungsbild von Evolution konfigurieren"
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Evolution-Zusammenfassungskomponente."
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component."
+#, fuzzy
+msgid "Evolution Summary component"
 msgstr "Evolution-Zusammenfassungskomponente."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Evolution-Zusammenfassungskomponente."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "Zusammenfassungs-Einstellungen"
 
@@ -23894,15 +23956,15 @@ msgstr "KBOS"
 msgid "%A, %B %e %Y"
 msgstr "%A, %e. %B %Y"
 
-#: my-evolution/e-summary.c:524
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "Bitte warten..."
 
-#: my-evolution/e-summary.c:590 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Zusammenfassung drucken"
 
-#: my-evolution/e-summary.c:624
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Drucken der Übersicht fehlgeschlagen"
 
@@ -25173,21 +25235,21 @@ msgid "_Weather"
 msgstr "_Wetter"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr ""
-"Konfigurations-Bedienelement für die Ordnereinstellungen von Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr "Hier können Sie spezielle Ordner und Offline-Ordner konfigurieren"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Die Evolution-Shell."
+
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
-msgstr "Ordner-Einstellungen"
+msgid "Evolution folder settings configuration control"
+msgstr ""
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "Die Evolution-Shell."
+msgid "Folder Settings"
+msgstr "Ordner-Einstellungen"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25219,8 +25281,8 @@ msgstr "Einen Ordner hinzufügen"
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:495
-#: shell/e-shell-view.c:499 shell/e-shortcuts.c:1084
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Eingang"
 
@@ -25256,40 +25318,7 @@ msgstr ""
 "Ein Fehler trat auf beim Kopieren von Dateien nach\n"
 "'%s'."
 
-#: shell/e-setup.c:243
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Verzeichnis %s konnte nicht angelegt werden:\n"
-"%s"
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-"Das Verzeichnis %s\n"
-"hat nicht die notwendigen Berechtigungen. Bitte\n"
-"erlauben Sie den Lese- und Schreibzugriff und\n"
-"starten Sie Evolution neu."
-
-#: shell/e-setup.c:267
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-"Die Datei %s\n"
-"sollte gelöscht werden, damit Evolution korrekt funktioniert.\n"
-"Bitte löschen Sie diese Datei und starten Sie Evolution neu."
-
-#: shell/e-setup.c:290
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25300,7 +25329,7 @@ msgstr ""
 "Bitte verschieben Sie es, damit Evolution seine\n"
 "Benutzerdateien installieren kann."
 
-#: shell/e-setup.c:299
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25446,7 +25475,7 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Neuen Ordner anlegen"
 
-#: shell/e-shell-folder-title-bar.c:593 shell/e-shell-folder-title-bar.c:594
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Namenlos)"
 
@@ -25485,17 +25514,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Wählen Sie einen Importeur"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datei %s existiert nicht"
 
-#: shell/e-shell-importer.c:492 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:551
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:552
 msgid "Evolution Error"
 msgstr "Evolution-Fehler"
 
-#: shell/e-shell-importer.c:508
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25505,11 +25534,11 @@ msgstr ""
 "%s\n"
 "umgehen kann"
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Importieren"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25518,17 +25547,17 @@ msgstr ""
 "Importieren von %s.\n"
 "Starten von %s"
 
-#: shell/e-shell-importer.c:536
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Fehler beim Starten von %s"
 
-#: shell/e-shell-importer.c:550
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: shell/e-shell-importer.c:567
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25537,31 +25566,31 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/e-shell-importer.c:621
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:670
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: shell/e-shell-importer.c:675
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:709
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Daten und Einstellungen aus älteren Programmen importieren"
 
-#: shell/e-shell-importer.c:713
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Eine einzelne Datei importieren"
 
-#: shell/e-shell-importer.c:779 shell/e-shell-startup-wizard.c:538
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25569,24 +25598,24 @@ msgstr ""
 "Bitte warten...\n"
 "Suche nach existierenden Einstellungen"
 
-#: shell/e-shell-importer.c:782
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Intelligente Importeure werden gestartet"
 
-#: shell/e-shell-importer.c:906 shell/e-shell-startup-wizard.c:664
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Geben Sie einen Zielordner für das Importieren dieser Daten an"
 
-#: shell/e-shell-importer.c:1211 shell/importer/intelligent.c:191
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Importieren"
 
@@ -25728,27 +25757,27 @@ msgstr "Offline arbeiten"
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:2054
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:2056
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(keine)"
 
-#: shell/e-shell-view.c:2100
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um "
 "offline zu arbeiten."
 
-#: shell/e-shell-view.c:2107
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution geht gerade offline."
 
-#: shell/e-shell-view.c:2113
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25766,12 +25795,12 @@ msgstr ""
 "Der Fehler im Aktivierungssystem lautet:\n"
 "%s"
 
-#: shell/e-shell.c:738
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Lokaler Speicher konnte nicht eingestellt werden -- %s"
 
-#: shell/e-shell.c:1804
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25782,19 +25811,19 @@ msgstr ""
 "unerwartet ab. Sie müssen Evolution beenden und neu starten, um\n"
 "wieder auf diese Daten zugreifen zu können."
 
-#: shell/e-shell.c:2069
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Ungültige Argumente"
 
-#: shell/e-shell.c:2071
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF konnte nicht stattfinden"
 
-#: shell/e-shell.c:2073
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: shell/e-shell.c:2075 shell/e-storage.c:572
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
@@ -26031,63 +26060,63 @@ msgstr ""
 "Der Fehler vom Aktivierungssystem ist:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA-Fehler"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Unterbrochen"
 
-#: shell/evolution-shell-component.c:1171
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Ungültiges Argument"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Hat bereits einen Besitzer"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Kein Besitzer"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: shell/evolution-shell-component.c:1179
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Nicht unterstützter Typ"
 
-#: shell/evolution-shell-component.c:1181
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Nicht unterstütztes Schema"
 
-#: shell/evolution-shell-component.c:1183
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Nicht unterstützte Aktion"
 
-#: shell/evolution-shell-component.c:1185
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Existiert"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Ungültiger URI"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Hat Unterordner"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Keine Platz mehr frei"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Alter Besitzer ist gestorben"
 
@@ -26108,10 +26137,6 @@ msgstr ""
 msgid "The following connections are currently active:"
 msgstr "Die folgenden Verbindungen sind zur Zeit aktiv:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "dialog1"
-msgstr "Dialog1"
-
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
 msgstr "Ka_lender:"
@@ -26250,16 +26275,16 @@ msgstr "Mich nicht mehr fragen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kann Daten aus den folgenden Dateien importieren:"
 
-#: shell/main.c:109 shell/main.c:506
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Evolution wird beendet..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:216
+#: shell/main.c:266
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26298,7 +26323,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen das Ergebnis unserer harten Arbeit gefällt\n"
 "und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
 
-#: shell/main.c:240
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26306,40 +26331,44 @@ msgstr ""
 "Danke\n"
 "Das Ximian Evolution-Team\n"
 
-#: shell/main.c:248
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "Nicht mehr anzeigen"
 
-#: shell/main.c:335
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Auf die Ximian-Evolution-Shell konnte nicht zugegriffen werden."
 
-#: shell/main.c:344
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Die Ximian-Evolution-Shell konnte nicht initialisiert werden: %s"
 
-#: shell/main.c:476
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Splashscreen deaktivieren"
 
-#: shell/main.c:478
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
-#: shell/main.c:480
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: shell/main.c:482
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr ""
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: shell/main.c:485
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Aktualisierung der Konfigurationsdateien von Evolution 1.0.x erzwingen"
 
-#: shell/main.c:510
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26349,7 +26378,6 @@ msgstr ""
 " Verwenden Sie %s --help, um weitere Informationen zu erhalten.\n"
 
 #: tools/evolution-addressbook-abuse.c:81
-#: tools/evolution-addressbook-export.c:41
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Fehler beim Laden des voreingestellten Adressbuchs."
@@ -26359,10 +26387,6 @@ msgstr "Fehler beim Laden des voreingestellten Adressbuchs."
 msgid "Input File"
 msgstr "Eingabedatei"
 
-#: tools/evolution-addressbook-export.c:51
-msgid "Output File"
-msgstr "Ausgabedatei"
-
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Kein Dateiname angegeben."
@@ -26392,6 +26416,19 @@ msgstr "Anlage als an Ort und Stelle anzuzeigend markieren."
 msgid "Default subject for the message."
 msgstr "Vorgabebetreff für die Nachricht."
 
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "'%s' konnte nicht umbenannt werden: %s"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kontakt(e) in einen anderen Ordner kopieren..."
@@ -27888,12 +27925,12 @@ msgstr "Ansichten definieren"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:434
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1107
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -28033,47 +28070,215 @@ msgstr "Frage"
 msgid "Message"
 msgstr "Meldung"
 
-#: widgets/misc/e-search-bar.c:518
+#: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_Suchen"
 
-#: widgets/misc/e-search-bar.c:524
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr "Jetzt _suchen"
 
-#: widgets/misc/e-search-bar.c:525
+#: widgets/misc/e-search-bar.c:538
 msgid "_Clear"
 msgstr "_Löschen"
 
-#: widgets/misc/e-search-bar.c:826
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr "Objektkennung"
 
-#: widgets/misc/e-search-bar.c:833
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr "Kennung des Unterobjekts"
 
-#: widgets/misc/e-search-bar.c:840
+#: widgets/misc/e-search-bar.c:847
 msgid "Text"
 msgstr "Text"
 
-#: widgets/misc/e-search-bar.c:918
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Löschen"
 
-#: widgets/misc/e-search-bar.c:920
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Jetzt suchen"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Der persönliche Adressbuch-Server"
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Evolution-Adressbuch Minikarten-Betrachter"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
 #: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Der persönliche Kalender-Server; Kalenderfabrik"
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Evolution Kelender iTip/iMip-Betrachter"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolution-Adressbuch Minikarten-Betrachter"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Fabrik zum Import von LDIF-Dateien in Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importiert LDIF-Dateien in Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Fabrik zum Import von VCard-Dateien in Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importiert VCard-Dateien in Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Ein Bonobo-Bedienelement für ein Adress-Popup."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Ein Bonobo-Bedienelement zur Anzeige einer Adresse."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Ein Bonobo-Beispiel-Menüelement zur Anzeige eines Adressbuches."
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr ""
+#~ "Konfigurations-Bedienelement zum Speichern des Evolution-Adressbuchs."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Bedienelement zur Anzeige einer Evolution-Adressbuch-Minikarte."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Evolution-Komponente für den Umgang mit Kontakten."
+
+#~ msgid "Factory for the controls exported by the Evolution Addressbook"
+#~ msgstr "Fabrik für die vom Evolution-Adressbuch exportierten Bedienelemente"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr ""
+#~ "Fabrik für die Oberfläche zur Auswahl eines Namens für das Evolution-"
+#~ "Adressbuch"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Namenlose Kontaktliste"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d nicht gezeigt)"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Ein Bonobo-Bedienelement zur Anzeige einer Aufgabenliste."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Ein Bonobo-Beispiel-Bedienelement zur Anzeige eines Kalenders"
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Konfigurations-Bedienelement für den Evolution-Kalender."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Evolution-Komponente für den Umgang mit E-Mails."
+
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Fabrik für die Kalender-Objekte von Evolution"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr ""
+#~ "Fabrik zur Zentralisierung der Dialoge des Kalender-Komponenteneditors"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Alarm-Benachrichtigungsdienst"
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Fabrik zum Import von iCalendar-Dateien in Evolution"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importiert iCalendar-Dateien in Evolution"
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importiert vCalendar-Dateien in Evolution"
+
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr ""
+#~ "Konfigurations-Bedienelement für die von Evolution verwendeten "
+#~ "Schriftarten."
+
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Konfigurations-Bedienelement für die Evolution E-Mail-Konten."
+
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Konfigurations-Bedienelement für den Evolution-Mailer."
+
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Konfigurations-Bedienelement für den Evolution Nachrichten-Editor."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Evolution-Komponente für den Umgang mit E-Mail."
+
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr "Fabrik für die vom Evolution-Mailer exportierten Steuerungen"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Fabrik, zum Import von mbox-Dateien in Evolution."
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importiert mbox-Dateien in Evolution."
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr ""
+#~ "Fabrik zum Import von mit Outlook Express 4 erstellten E-Mails in "
+#~ "Evolution."
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importiert Outlook-Express-4-Dateien in Evolution."
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Bildschirmschriftarten"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "_Feste Breite:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "_Variable Breite:"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Konfigurations-Bedienelement für die Evolution-Zusammenfassung."
+
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr ""
+#~ "Konfigurations-Bedienelement für die Ordnereinstellungen von Evolution."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Verzeichnis %s konnte nicht angelegt werden:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Directory %s\n"
+#~ "does not have the right permissions. Please make it\n"
+#~ "readable and executable and restart Evolution."
+#~ msgstr ""
+#~ "Das Verzeichnis %s\n"
+#~ "hat nicht die notwendigen Berechtigungen. Bitte\n"
+#~ "erlauben Sie den Lese- und Schreibzugriff und\n"
+#~ "starten Sie Evolution neu."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "Die Datei %s\n"
+#~ "sollte gelöscht werden, damit Evolution korrekt funktioniert.\n"
+#~ "Bitte löschen Sie diese Datei und starten Sie Evolution neu."
+
+#~ msgid "Output File"
+#~ msgstr "Ausgabedatei"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Der persönliche Adressbuch-Server"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Der persönliche Kalender-Server; Kalenderfabrik"
 
 #~ msgid "1234"
 #~ msgstr "1234"
@@ -28315,9 +28520,6 @@ msgstr "Der persönliche Kalender-Server; Kalenderfabrik"
 #~ msgid "th"
 #~ msgstr "."
 
-#~ msgid "Evolution mail folder factory component."
-#~ msgstr "Evolution-Mailordner-Fabrik-Komponente."
-
 #~ msgid "Factory for the Evolution composer."
 #~ msgstr "Fabrik für den Evolution-Maileditor."
 
diff --git a/po/el.po b/po/el.po
index 20166b586d..5d256ccfd1 100644
--- a/po/el.po
+++ b/po/el.po
@@ -21,7 +21,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0.1.99\n"
-"POT-Creation-Date: 2003-01-21 18:59+0200\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-01-21 18:40+0200\n"
 "Last-Translator: Kostas Papadimas <pkst@gmx.net>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -30,189 +30,52 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: addressbook/backend/ebook/e-card.c:1297
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Αρχειοθέτηση Ως"
 
-#: addressbook/backend/ebook/e-card.c:1304
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:320
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Πλήρες Όνομα"
-
-#: addressbook/backend/ebook/e-card.c:1311
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Όνομα"
 
-#: addressbook/backend/ebook/e-card.c:1317
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Διεύθυνση:"
-
-#: addressbook/backend/ebook/e-card.c:1324
-msgid "Address Label"
-msgstr "Ετικέτα διεύθυνσης"
-
-#: addressbook/backend/ebook/e-card.c:1331
-msgid "Phone"
-msgstr "Τηλέφωνο"
-
-#: addressbook/backend/ebook/e-card.c:1338
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/backend/ebook/e-card.c:1345
-msgid "Birth date"
-msgstr "Ημερομηνία Γέννησης"
-
-#: addressbook/backend/ebook/e-card.c:1351
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1358
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Οργανισμός"
-
-#: addressbook/backend/ebook/e-card.c:1365
-msgid "Organizational Unit"
-msgstr "Μονάδα Οργανισμού"
-
-#: addressbook/backend/ebook/e-card.c:1372
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Γραφείο"
-
-#: addressbook/backend/ebook/e-card.c:1379
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Τίτλος"
-
-#: addressbook/backend/ebook/e-card.c:1386
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Ρόλος"
-
-#: addressbook/backend/ebook/e-card.c:1393
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Διευθυντής"
-
-#: addressbook/backend/ebook/e-card.c:1400
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Βοηθός"
-
-#: addressbook/backend/ebook/e-card.c:1407
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Ψευδώνυμο"
-
-#: addressbook/backend/ebook/e-card.c:1414
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Σύζυγος"
-
-#: addressbook/backend/ebook/e-card.c:1421
-#: addressbook/backend/ebook/e-card-simple.c:100
-msgid "Anniversary"
-msgstr "Επέτειος"
-
-#: addressbook/backend/ebook/e-card.c:1427 mail/mail-format.c:933
-msgid "Mailer"
-msgstr "Πρόγραμμα αλληλογραφίας"
-
-#: addressbook/backend/ebook/e-card.c:1434
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "URI Ημερολογίου"
-
-#: addressbook/backend/ebook/e-card.c:1441
-msgid "Free/Busy URL"
-msgstr "Διαθέσιμο/απασχολημένο URL"
-
-#: addressbook/backend/ebook/e-card.c:1448
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Σημείωση"
-
-#: addressbook/backend/ebook/e-card.c:1455
-msgid "Related Contacts"
-msgstr "Σχετικές επαφές"
-
-#: addressbook/backend/ebook/e-card.c:1462
-#: addressbook/backend/ebook/e-card-simple.c:104
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Κατηγορίες"
-
-#: addressbook/backend/ebook/e-card.c:1469
-msgid "Category List"
-msgstr "Λίστα κατηγορίας"
-
-#: addressbook/backend/ebook/e-card.c:1476
-msgid "Wants HTML"
-msgstr "Επιθυμεί  HTML"
-
-#: addressbook/backend/ebook/e-card.c:1483
-msgid "Wants HTML set"
-msgstr "Ορισμός αποδοχής HTML "
-
-#: addressbook/backend/ebook/e-card.c:1490
-msgid "List"
-msgstr "Λίστα"
-
-#: addressbook/backend/ebook/e-card.c:1497
-msgid "List Show Addresses"
-msgstr "Εμφάνιση λίστας διευθύνσεων"
-
-#: addressbook/backend/ebook/e-card.c:1504
-msgid "Arbitrary"
-msgstr "Τυχαίο"
-
-#: addressbook/backend/ebook/e-card.c:1511
-msgid "ID"
-msgstr "ID"
-
-#: addressbook/backend/ebook/e-card.c:1518
-msgid "Last Use"
-msgstr "Τελευταία χρήση"
-
-#: addressbook/backend/ebook/e-card.c:1529
-msgid "Use Score"
-msgstr "Χρήση σκορ"
-
-#: addressbook/backend/ebook/e-card.c:2870
-msgid "Multiple VCards"
-msgstr "Πολλαπλές Εκάρτες"
-
-#: addressbook/backend/ebook/e-card.c:2878
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard για %s"
-
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Πρωτεύον"
 
@@ -220,11 +83,19 @@ msgstr "Πρωτεύον"
 msgid "Prim"
 msgstr "Πρωτ."
 
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Βοηθός"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
-#: addressbook/gui/contact-editor/e-contact-editor.c:1800
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Εργασία"
 
@@ -234,12 +105,12 @@ msgid "Bus"
 msgstr "Εργ."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Επικοινωνία"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Εταιρεία"
 
@@ -250,29 +121,35 @@ msgstr "Εταιρ."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1735
-#: addressbook/gui/contact-editor/e-contact-editor.c:1801
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Οικία"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1362
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Οργανισμός"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Οργ."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Κινητό"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "Αυτοκίνητο"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Φαξ Εργασίας"
@@ -282,13 +159,13 @@ msgid "Bus Fax"
 msgstr "Φαξ Εργ."
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Φαξ Οικίας"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Εργασία 2"
 
@@ -297,43 +174,43 @@ msgid "Bus 2"
 msgstr "Εργ. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Οικία 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
-#: addressbook/gui/contact-editor/e-contact-editor.c:1802
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Άλλα"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Άλλο Φαξ"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Ειδοποιητής"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Ραδιόφωνο"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Τηλέτυπο"
@@ -344,15 +221,15 @@ msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1773
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Email 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1774
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Email 3"
@@ -376,9 +253,21 @@ msgid "Dep"
 msgstr "Τμήμ."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1376
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Γραφείο"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Γραφ."
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1383
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Τίτλος"
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -389,6 +278,12 @@ msgid "Prof"
 msgstr "Επάγγ."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1397
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Διευθυντής"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Διευθ."
 
@@ -397,9 +292,32 @@ msgid "Ass"
 msgstr "Βοηθ."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1411
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Ψευδώνυμο"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Ψευδ."
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1418
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Σύζυγος"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1459
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Σημείωση"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
+msgid "Calendar URI"
+msgstr "URI Ημερολογίου"
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "URI Ημερ."
@@ -414,132 +332,361 @@ msgid "FBUrl"
 msgstr "UrlΔιαθ"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Default server calendar"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "Ημερολόγιο"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
+msgid "Anniversary"
+msgstr "Επέτειος"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Επέτ."
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Ημερομηνία Γέννησης"
 
 #: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Κατηγορίες"
+
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Οικογενειακό Όνομα"
 
-#: addressbook/backend/ebook/e-card-simple.c:334
+#: addressbook/backend/ebook/e-card-simple.c:335
 msgid "ECard"
 msgstr "ECard"
 
-#: addressbook/backend/ebook/e-card-simple.c:829
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:890
-#: addressbook/backend/ebook/e-destination.c:704
+#: addressbook/backend/ebook/e-card-simple.c:893
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Λίστα Χωρίς Τίτλο"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Εργοστάσιο για την εισαγωγή αρχείων LDIF στο Evolution."
+#: addressbook/backend/ebook/e-card.c:1308
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Πλήρες Όνομα"
+
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Διεύθυνση:"
+
+#: addressbook/backend/ebook/e-card.c:1328
+msgid "Address Label"
+msgstr "Ετικέτα διεύθυνσης"
+
+#: addressbook/backend/ebook/e-card.c:1335
+msgid "Phone"
+msgstr "Τηλέφωνο"
+
+#: addressbook/backend/ebook/e-card.c:1349
+msgid "Birth date"
+msgstr "Ημερομηνία Γέννησης"
+
+#: addressbook/backend/ebook/e-card.c:1355
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1369
+msgid "Organizational Unit"
+msgstr "Μονάδα Οργανισμού"
+
+#: addressbook/backend/ebook/e-card.c:1390
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Ρόλος"
+
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+msgid "Mailer"
+msgstr "Πρόγραμμα αλληλογραφίας"
+
+#: addressbook/backend/ebook/e-card.c:1445
+msgid "Free/Busy URL"
+msgstr "Διαθέσιμο/απασχολημένο URL"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Ημερολόγιο"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Εισάγει αρχεία LDIF στο Evolution."
+#: addressbook/backend/ebook/e-card.c:1466
+msgid "Related Contacts"
+msgstr "Σχετικές επαφές"
+
+#: addressbook/backend/ebook/e-card.c:1480
+msgid "Category List"
+msgstr "Λίστα κατηγορίας"
+
+#: addressbook/backend/ebook/e-card.c:1487
+msgid "Wants HTML"
+msgstr "Επιθυμεί  HTML"
+
+#: addressbook/backend/ebook/e-card.c:1494
+msgid "Wants HTML set"
+msgstr "Ορισμός αποδοχής HTML "
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Εργοστάσιο για την εισαγωγή αρχείων VCard στο Evolution"
+#: addressbook/backend/ebook/e-card.c:1501
+msgid "List"
+msgstr "Λίστα"
+
+#: addressbook/backend/ebook/e-card.c:1508
+msgid "List Show Addresses"
+msgstr "Εμφάνιση λίστας διευθύνσεων"
+
+#: addressbook/backend/ebook/e-card.c:1515
+msgid "Arbitrary"
+msgstr "Τυχαίο"
+
+#: addressbook/backend/ebook/e-card.c:1522
+msgid "ID"
+msgstr "ID"
+
+#: addressbook/backend/ebook/e-card.c:1529
+msgid "Last Use"
+msgstr "Τελευταία χρήση"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Εισαγωγή αρχείων VCard στο Evolution."
+#: addressbook/backend/ebook/e-card.c:1540
+msgid "Use Score"
+msgstr "Χρήση σκορ"
 
-#: addressbook/backend/ebook/test-client.c:31
 #: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/conduit/address-conduit.c:1860
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "Δεν ήταν δυνατή η αρχικοποίηση του Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:355
-#: addressbook/backend/pas/pas-backend-ldap.c:3027
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Γίνεται αναζήτηση..."
 
-#: addressbook/backend/pas/pas-backend-file.c:357
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Γίνεται φόρτωση..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:597
+#: addressbook/backend/pas/pas-backend-ldap.c:598
 msgid "Using Distinguished Name (DN)"
 msgstr "Χρήση Διακεκριμένου ονόματος  (DN)"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:601
+#: addressbook/backend/pas/pas-backend-ldap.c:602
 msgid "Using Email Address"
 msgstr "Χρήση διεύθυνσης  Email "
 
-#: addressbook/backend/pas/pas-backend-ldap.c:736
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr "Επανασύνδεση με τον διακομιστή LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1279
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Προσθήκη κάρτας στον διακομιστή LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1385
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Αφαίρεση κάρτας από τον διακομιστή LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1621
-#: addressbook/backend/pas/pas-backend-ldap.c:1624
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "Τροποποίηση κάρτας στον διακομιστή LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2938
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Λήψη αποτελεσμάτων αναζήτησης από LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:3047
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr "Σφάλμα εκτέλεσης αναζήτησης"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Εξ ορισμού διεύθυνση συγχρονισμού:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Δεν ήταν δυνατή η φόρτωση του δρομέα\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "To ΕΒοοk δεν φορτώθηκε\n"
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Δεν ήταν δυνατή η εκκίνηση του διακομιστή wombat"
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Δεν ήταν δυνατή η εκκίνηση του wombat"
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr ""
 "Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
 
-#: addressbook/gui/component/addressbook.c:514
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr "Ρυθμίστε εδώ την πρόσβαση στους διακομιστές καταλόγου  LDAP"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr "Εξυπηρετητές καταλόγου"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Διασύνδεση επιλογής ονομάτων του Βιβλίου Διευθύνσεων του Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Στοιχείο δοκιμής του Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Επαφές"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Φάκελος που περιέχει πληροφορίες επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "Διακομιστής LDAP"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "Διακομιστής LDAP που περιέχει πληροφορίες επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Κοινόχρηστες επαφές"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Κοινόχρηστος φάκελος που περιέχει πληροφορίες επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Νέα Επαφή"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Επαφή"
+
+#: addressbook/gui/component/addressbook-component.c:565
+msgid "Create a new contact"
+msgstr "Δημιουργία νέας επαφής"
+
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "New Contact List"
+msgstr "Νέα Λίστα Επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "Contact _List"
+msgstr "_Λίστα Επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:569
+msgid "Create a new contact list"
+msgstr "Δημιουργία νέας λίστας επαφών"
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr "Δεν είναι δυνατή η σύνδεση με τον διακομιστή LDAP."
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr "Δεν ήταν δυνατή η πιστοποίηση στον διακομιστή  LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr "Αδύνατη η δημιουργία ερωτήματος στο  Root DSE"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr "Ο διακομιστής αποκρίθηκε χωρίς υποστηριζόμενες βάσεις αναζήτησης"
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Αυτός ο διακομιστής δεν υποστηρίζει σχήμα πληροφοριών LDAPv3"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr "Σφάλμα ανάκτησης σχήματος πληροφοριών"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr "Η απάντηση του διακομιστή  δεν περιείχε έγκυρο σχήμα πληροφοριών"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Όνομα Λογαριασμού"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Όνομα Διακομιστή"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "Το LDAP δεν ενεργοποιήθηκε σε αυτή την έκδοση του evolution"
+
+#: addressbook/gui/component/addressbook-storage.c:169
+msgid "Other Contacts"
+msgstr "Λοιπές Επαφές"
+
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -547,7 +694,7 @@ msgstr ""
 "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων.  Παρακαλώ ελέγξτε αν\n"
 "η διαδρομή υπάρχει και ότι έχετε το δικαίωμα πρόσβασης σε αυτό."
 
-#: addressbook/gui/component/addressbook.c:524
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -557,7 +704,7 @@ msgstr ""
 "σημαίνει ότι έχετε εισαγάγει λάθος URI, ή ότι ο εξυπηρετητής LDAP είναι\n"
 "εκτός λειτουργίας."
 
-#: addressbook/gui/component/addressbook.c:529
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -569,7 +716,7 @@ msgstr ""
 "συνθέσετε το πρόγραμμα από τις πηγές CVS αφού κάνετε\n"
 "λήψη του OpenLDAP από τον παρακάτω σύνδεσμο.\n"
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:537
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -579,49 +726,48 @@ msgstr ""
 "σημαίνει ότι έχετε εισαγάγει λάθος URI, ή ότι ο εξυπηρετητής  είναι\n"
 "εκτός λειτουργίας."
 
-#: addressbook/gui/component/addressbook.c:559
+#: addressbook/gui/component/addressbook.c:557
 msgid "Unable to open addressbook"
 msgstr "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων"
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ανώνυμη πρόσβαση διακομιστή  LDAP"
 
-#: addressbook/gui/component/addressbook.c:662
+#: addressbook/gui/component/addressbook.c:667
 msgid "Failed to authenticate.\n"
 msgstr "Δεν ήταν δυνατή η πιστοποίηση.\n"
 
-#: addressbook/gui/component/addressbook.c:670
-#: addressbook/gui/component/addressbook.c:673
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sΕισάγετε κωδικό πρόσβασης για %s (χρήστης %s)"
 
-#: addressbook/gui/component/addressbook.c:821
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr "Όνομα αρχίζει με"
 
-#: addressbook/gui/component/addressbook.c:822
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr "Email αρχίζει με"
 
-#: addressbook/gui/component/addressbook.c:823
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Η κατηγορία είναι"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:824
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Κάθε πεδίο περιέχει"
 
-#: addressbook/gui/component/addressbook.c:825
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Για Προχωρημένους..."
 
-#: addressbook/gui/component/addressbook.c:995
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -633,7 +779,7 @@ msgstr ""
 "ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
 "για αυτό το ευρετήριο διευθύνσεων."
 
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -647,25 +793,25 @@ msgstr ""
 "ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
 "για αυτό το ευρετήριο διευθύνσεων. "
 
-#: addressbook/gui/component/addressbook.c:1007
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Το backend για αυτό το ευρετήριο διευθύνσεων αδυνατεί να αναλύσει αυτό το "
 "ερώτημα."
 
-#: addressbook/gui/component/addressbook.c:1010
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Το backend για αυτό το ευρετήριο διευθύνσεων αρνήθηκε να αναλύσει αυτό το "
 "ερώτημα."
 
-#: addressbook/gui/component/addressbook.c:1014
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr "Αυτό το ερώτημα δεν ολοκληρώθηκε επιτυχώς."
 
 #. All, unmatched, separator
 #: addressbook/gui/component/addressbook.c:1089
-#: calendar/gui/cal-search-bar.c:352
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr "Κάθε Κατηγορία"
 
@@ -673,239 +819,96 @@ msgstr "Κάθε Κατηγορία"
 msgid "The URI that the Folder Browser will display"
 msgstr "Το URI που θα εμφανίσει η Αναζήτηση Φακέλων"
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:609
-#: calendar/gui/dialogs/comp-editor-util.c:309
-#: calendar/gui/dialogs/comp-editor-util.c:365
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1085
-msgid "Contacts"
-msgstr "Επαφές"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Φάκελος που περιέχει πληροφορίες επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "Διακομιστής LDAP"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "Διακομιστής LDAP που περιέχει πληροφορίες επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Κοινόχρηστες επαφές"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Κοινόχρηστος φάκελος που περιέχει πληροφορίες επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:568
-msgid "New Contact"
-msgstr "Νέα Επαφή"
-
-#: addressbook/gui/component/addressbook-component.c:568
-msgid "_Contact"
-msgstr "_Επαφή"
-
-#: addressbook/gui/component/addressbook-component.c:569
-msgid "Create a new contact"
-msgstr "Δημιουργία νέας επαφής"
-
-#: addressbook/gui/component/addressbook-component.c:572
-msgid "New Contact List"
-msgstr "Νέα Λίστα Επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:572
-msgid "Contact _List"
-msgstr "_Λίστα Επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:573
-msgid "Create a new contact list"
-msgstr "Δημιουργία νέας λίστας επαφών"
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Δεν είναι δυνατή η σύνδεση με τον διακομιστή LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Δεν ήταν δυνατή η πιστοποίηση στον διακομιστή  LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr "Αδύνατη η δημιουργία ερωτήματος στο  Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "Ο διακομιστής αποκρίθηκε χωρίς υποστηριζόμενες βάσεις αναζήτησης"
-
-#: addressbook/gui/component/addressbook-config.c:1191
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Αυτός ο διακομιστής δεν υποστηρίζει σχήμα πληροφοριών LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1213
-msgid "Error retrieving schema information"
-msgstr "Σφάλμα ανάκτησης σχήματος πληροφοριών"
-
-#: addressbook/gui/component/addressbook-config.c:1221
-msgid "Server did not respond with valid schema information"
-msgstr "Η απάντηση του διακομιστή  δεν περιείχε έγκυρο σχήμα πληροφοριών"
-
-#: addressbook/gui/component/addressbook-config.c:1647
-msgid "Account Name"
-msgstr "Όνομα Λογαριασμού"
-
-#: addressbook/gui/component/addressbook-config.c:1649
-msgid "Server Name"
-msgstr "Όνομα Διακομιστή"
-
-#: addressbook/gui/component/addressbook-config.c:1686
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Το LDAP δεν ενεργοποιήθηκε σε αυτή την έκδοση του evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:169
-msgid "Other Contacts"
-msgstr "Λοιπές Επαφές"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: addressbook/gui/component/e-address-popup.c:474
+#: addressbook/gui/component/e-address-popup.c:478
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:1772
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "Πρωτεύον Email"
 
-#: addressbook/gui/component/e-address-popup.c:610
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Επιλογή Ενέργειας"
 
-#: addressbook/gui/component/e-address-popup.c:617
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Δημιουργία νέας επαφής \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:632
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Προσθήκη διεύθυνσης στην υπάρχουσα επαφή \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:913
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Υποβολή ερωτήματος στο Βιβλίο Διευθύνσεων..."
 
-#: addressbook/gui/component/e-address-popup.c:995
-#: addressbook/gui/component/e-address-widget.c:391
-#: addressbook/gui/component/select-names/e-select-names-popup.c:302
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Επεξεργασία Πληροφοριών Επαφής"
 
-#: addressbook/gui/component/e-address-popup.c:1025
-#: addressbook/gui/component/e-address-widget.c:427
-#: addressbook/gui/component/select-names/e-select-names-popup.c:481
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Προσθήκη στις Επαφές"
 
-#: addressbook/gui/component/e-address-popup.c:1068
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Συγχώνευση Διεύθυνσης E-mail"
 
-#: addressbook/gui/component/e-address-widget.c:368
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Απενεργοποίηση υποβολής ερωτημάτων"
 
-#: addressbook/gui/component/e-address-widget.c:368
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Ενεργοποίηση υποβολής ερωτημάτων (Επικίνδυνο!)"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Στοιχείο ελέγχου του Bonobo για την ανάδυση μιας διεύθυνσης."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Στοιχείο ελέγχου του Bonobo για την προβολή μιας διεύθυνσης."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Δείγμα ελέγχου Bonobo για την προβολή ενός Βιβλίου Διευθύνσεων"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr ""
-"Έλεγχος Ρυθμίσεων για τις αποθήκες του Ευρετηρίου Διευθύνσεων του Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Ρυθμίστε εδώ την πρόσβαση στους διακομιστές καταλόγου  LDAP"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-"Στοιχείο ελέγχου για την προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του "
-"Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "Εξυπηρετητές καταλόγου"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Στοιχείο του Evolution για τη διαχείριση των επαφών."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Factory for the controls exported by the Evolution Addressbook"
-msgstr ""
-"Εργοστάσιο για τους ελέγχους που εξάγονται από το Ευρετήριο διευθύνσεων του "
-"Evolution"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr "Ε_μφάνιση υποστηριζόμενων βάσεων"
 
-#: addressbook/gui/component/ldap-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:4
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
-#: mail/mail-config.glade.h:4
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
-msgid "1234"
-msgstr "1234"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr "2:30"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
-msgid "380"
-msgstr "380"
-
 #: addressbook/gui/component/ldap-config.glade.h:8
 msgid "389"
 msgstr "389"
@@ -919,35 +922,24 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "666"
-msgstr "666"
+#, fuzzy
+msgid "Add LDAP Server"
+msgstr "Διακομιστής LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "<- _Remove"
-msgstr "<- _Απομάκρυνση"
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "<< Fewer Options"
-msgstr "<< Λιγότερες επιλογές"
-
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "Add (or Edit) Attribute Mappings"
-msgstr "Προσθήκη (ή Επεξεργασία) χαρτογραφήσεων γνωρισμάτων"
-
-#: addressbook/gui/component/ldap-config.glade.h:15
 msgid "Addressbook Sources"
 msgstr "Πηγές Βιβλίου Διευθύνσεων"
 
-#: addressbook/gui/component/ldap-config.glade.h:16 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Πάντοτε"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr "Ανώνυμα"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -961,62 +953,59 @@ msgstr ""
 "Πατήστε το πλήκτρο \"Τέλος\" για να αποθηκεύσετε τις ρυθμίσεις που έχετε "
 "εισάγει εδώ."
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Σύνδεση"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "DN Customization"
-msgstr "Προσαρμογή DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "Δια_γραφή"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Διακεκριμένο ό_νομα"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "Διακομιστής LDAP"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "Διεύθυνση Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Το Evolution θα χρησιμοποίησει αυτό το DN για την πιστοποίησή σας στον "
 "διακομιστή"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Το Evolution θα χρησιμοποίηση αυτήν τη διεύθυνση για την πιστοποίησή σας "
 "στον διακομιστή"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "Ολοκληρώθηκε"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "Γενικά"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "Βοηθός ρύθμισης LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-msgid "Mappings"
-msgstr "Χαρτογραφήσεις"
-
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:62
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Ποτέ"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -1033,54 +1022,26 @@ msgstr ""
 "συστήματος αν αυτός ο διακομιστής\n"
 "χρησιμοποιεί αυτά τα πρωτόκολλα."
 
-#: addressbook/gui/component/ldap-config.glade.h:37
-msgid "Objectclasses"
-msgstr "Objectclasses"
-
-#: addressbook/gui/component/ldap-config.glade.h:38
-msgid "Objectclasses Used in Evolution:"
-msgstr "Objectclasses που χρησιμοποιούνται στο Evolution:"
-
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Objectclasses Used on Server:"
-msgstr "Objectclasses που χρησιμοποιούνται στον διακομιστή:"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Ένα"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-"Παρακαλώ επιλέξτε ένα γνώρισμα του Evolution  και ένα\n"
-"γνώρισμα LDAP για να το συσχετίσετε."
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "R_estore Defaults"
-msgstr "_Επαναφορά Εξ' ορισμού"
-
-#: addressbook/gui/component/ldap-config.glade.h:44
-msgid "Re_store Defaults"
-msgstr "Ε_παναφορά Εξ' ορισμού"
-
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Βάθος ανα_ζήτησης:"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:46
-#: calendar/gui/calendar-model.c:1977 calendar/gui/e-day-view.c:1666
-#: calendar/gui/e-week-view.c:1186
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 msgid "Searching"
 msgstr "Γίνεται αναζήτηση"
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Επιλεγμένα:"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -1090,7 +1051,7 @@ msgstr ""
 "διακομιστή LDAP\n"
 "μόνο αν ο διακομιστής υποστηρίζει SSL ή TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -1108,7 +1069,7 @@ msgstr ""
 "σύνδεση σας είναι ήδη\n"
 " ασφαλής."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1122,7 +1083,7 @@ msgstr ""
 "τρύπες \n"
 "ασφαλείας."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
@@ -1132,7 +1093,7 @@ msgstr ""
 "Evolution για\n"
 "αναζητήσεις LDAP και την δημιουργία και επεξεργασία επαφών."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
@@ -1140,31 +1101,31 @@ msgstr ""
 "Ο καθορισμός ενός ονόματος εμφάνισης είναι το τελευταίο απαιτούμενο βήμα "
 "στην ρύθμιση ενός διακομιστή LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr "Βήμα 1: Πληροφορίες διακομιστή"
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr "Βήμα 2: Σύνδεση στον διακομιστή"
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr "Βήμα 3: Αναζήτηση στο κατάλογο"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr "Βήμα 4: Όνομα Εμφάνισης"
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr "Υποστηριζόμενες βάσεις αναζήτησης"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1176,7 +1137,7 @@ msgstr ""
 "πληροφορίες εισόδου σας. Ζητήστε από τον διαχειριστή τις απαραίτητες "
 "πληροφορίες αν δεν είστε σίγουροι."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1190,7 +1151,7 @@ msgstr ""
 "διαχειριστή του συστήματος σας\n"
 "αν θέλετε να αλλάξετε αυτές τις επιλογές."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1202,7 +1163,7 @@ msgstr ""
 "αναζητήσεις σας. Αν αφήσετε αυτό κενό, η αναζήτηση θα ξεκινά από τον ριζικό "
 "κατάλογο του δέντρου. "
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:62
 #, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
@@ -1210,7 +1171,7 @@ msgid ""
 "directory tree. A search scope of \"sub\" will include all entries below "
 "your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
 msgstr ""
 "Το βάθος αναζήτησης καθορίζει το βάθος της αναζήτησης στο δέντρο του "
 "καταλόγου \n"
@@ -1219,7 +1180,7 @@ msgstr ""
 "Μια αναζήτηση με \"ένα\"  θα περιλαμβάνει μόνο τις καταχωρήσεις που "
 "βρίσκονται μόνο ένα επίπεδο κάτω.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1236,7 +1197,7 @@ msgstr ""
 "θέλετε\n"
 "βοήθεια για να βρείτε αυτές τις πληροφορίες."
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1244,7 +1205,7 @@ msgstr ""
 "Αυτό είναι το πλήρες όνομα του διακομιστή ldap. Για παράδειγμα , \"ldap."
 "mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -1254,7 +1215,7 @@ msgstr ""
 "μεγάλου αριθμού \n"
 "θα κάνει αργό το ευρετήριο διευθύνσεων σας."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1264,7 +1225,7 @@ msgstr ""
 "σας.  Σημειώστε ότι η ρύθμιση σε \"Διεύθυνση Email\" απαιτεί ανώνυμη "
 "πρόσβαση στον διακομιστή ldap. "
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -1274,7 +1235,7 @@ msgstr ""
 "του Evolution.\n"
 " Είναι μόνο για λόγους εμφάνισης."
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1287,88 +1248,46 @@ msgstr ""
 "συστήματος σας\n"
 "για το ποιά θύρα θα χρησιμοποιήσετε."
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr ""
 "Αυτή η επιλογή ελέγχει την χρονική διάρκεια της εκτέλεσης της αναζήτησης."
 
-#: addressbook/gui/component/ldap-config.glade.h:92
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-"Για να προσθέσετε ένα γνώρισμα στο DN, επιλέξτε το από την λίστα και πατήστε "
-"το κουμπί \"Προσθήκη Γνωρίσματος\".\n"
-"Όποιες τιμές προσθέσετε στο DN θα γίνουν απαιτούμενες τιμές για όλες τις "
-"νέες επαφές που θα\n"
-"προσθέσετε στον κατάλογο του διακομιστή LDAP."
-
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr "_Χρήση SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr "Χρήση διακεκριμένου ονόματος (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr "Χρήση  διεύθυνσης ταχυδρομείου"
 
-#: addressbook/gui/component/ldap-config.glade.h:98 mail/mail-account-gui.c:61
-#: mail/mail-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Όταν είναι δυνατόν"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:86
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:132 shell/glade/e-folder-list.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Προσθήκη"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
-msgid "_Add ->"
-msgstr "_Προσθήκη ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:101
-msgid "_Add Mapping"
-msgstr "Προσθήκη χαρτογράφησης"
-
-#: addressbook/gui/component/ldap-config.glade.h:102
-msgid "_Add to DN"
-msgstr "Προσ_θήκη στο  DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:103
-msgid "_Always"
-msgstr "_Πάντοτε"
-
-#: addressbook/gui/component/ldap-config.glade.h:104
-msgid "_Delete Mapping"
-msgstr "_Διαγραφή χαρτογράφησης"
-
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr "_Όνομα εμφάνισης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
-msgid "_Distinguished Name (DN):"
-msgstr "_Διακεκριμένο Όνομα (DN):"
-
-#: addressbook/gui/component/ldap-config.glade.h:107
-msgid "_Don't use SSL/TLS"
-msgstr "Να μη _γίνεται χρήση SSL/TLS"
-
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr "Όριο _μεταφόρτωσης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:109 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:147 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1377,147 +1296,90 @@ msgstr "Όριο _μεταφόρτωσης:"
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Edit Mapping"
-msgstr "_Επεξεργασία χαρτογράφησης"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-msgid "_Evolution attribute:"
-msgstr "Γνώρισμα _Evolution"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-msgid "_If necessary "
-msgstr "Α_ν είναι αναγκαίο"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_LDAP attribute:"
-msgstr "Γνώρισμα _LDAP:"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
-msgid "_LDAP attributes:"
-msgstr "Γνωρίσματα _LDAP:"
-
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr "Μέθοδος _πιστοποίησης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_More Options >>"
-msgstr "_Περισσότερες επιλογές >>"
-
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "Αριθμός _Θύρας:"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
-msgid "_Restore Defaults"
-msgstr "Επανα_φορά Εξ' ορισμού"
-
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr "Βάση  _αναζήτησης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "Όνομα _διακομιστή:"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "_Χρόνος λήξης (λεπτά)"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "account-druid"
-msgstr "οδηγός-λογαριασμού"
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "account-editor"
-msgstr "επεξεργαστής-λογαριασμού"
-
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr "κάρτες"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "connecting-tab"
 msgstr "στήλη-σύνδεσης"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
-msgid "dn-customization-tab"
-msgstr "dn-customization-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:127
-msgid "edit_server_window_simple"
-msgstr "edit_server_window_simple"
-
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "general-tab"
 msgstr "στήλη-γενικών"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
-msgid "mappings-tab"
-msgstr "mappings-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:130
-msgid "objectclasses-tab"
-msgstr "objectclasses-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "searching-tab"
 msgstr "στήλη-αναζήτησης"
 
-#: addressbook/gui/component/select-names/e-select-names.c:494
-msgid "Select Contacts from Addressbook"
-msgstr "Επιλέξτε Επαφές από το Βιβλίο Διευθύνσεων"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Διασύνδεση επιλογής ονομάτων του Βιβλίου Διευθύνσεων του Evolution."
 
-#: addressbook/gui/component/select-names/e-select-names.c:554
-msgid "Find contact in"
-msgstr "Εύρεση επαφής σε"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Αφαίρεση Όλων"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names.c:687
-#: addressbook/gui/component/select-names/e-select-names-popup.c:162
-#: composer/e-msg-composer-attachment-bar.c:504
-#: my-evolution/e-summary-shown.c:536 shell/e-shortcuts-view.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:177
-msgid "Remove All"
-msgstr "Αφαίρεση Όλων"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Νέα Λίστα Επαφών"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:201
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "Επεξεργασία Πληροφοριών Επαφής"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
 msgid "Send HTML Mail?"
 msgstr "Να αποσταλεί το μήνυμα HTML;"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:401
-msgid "Edit Contact List"
-msgstr "Επεξεργασία Λίστας Επαφών"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:419
-msgid "Unnamed Contact List"
-msgstr "Λίστα Επαφών Χωρίς Τίτλο"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:436
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d δεν εμφανίζεται)"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:502
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr "Επαφή Χωρίς Τίτλο"
 
-#: addressbook/gui/component/select-names/e-select-names-table-model.c:349
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Πηγή"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Διασύνδεση επιλογής ονομάτων του Βιβλίου Διευθύνσεων του Evolution."
+#: addressbook/gui/component/select-names/e-select-names.c:505
+msgid "Select Contacts from Addressbook"
+msgstr "Επιλέξτε Επαφές από το Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Εργοστάσιο για τη διασύνδεση επιλογής ονομάτων του Βιβλίου Διευθύνσεων"
+#: addressbook/gui/component/select-names/e-select-names.c:648
+msgid "Find contact in"
+msgstr "Εύρεση επαφής σε"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -1568,7 +1430,7 @@ msgid "Birthda_y:"
 msgstr "Γενέ_θλια:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "_Κατηγορίες..."
@@ -1579,7 +1441,7 @@ msgstr "Συνεργασία"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1322
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Επεξεργαστής Επαφών"
 
@@ -1588,7 +1450,7 @@ msgid "D_epartment:"
 msgstr "Τ_μήμα:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:191
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
@@ -1643,14 +1505,14 @@ msgid "Wants to receive _HTML mail"
 msgstr "Επιθυμεί την παραλαβή μηνυμάτων _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:653 calendar/gui/e-calendar-table.c:968
-#: calendar/gui/e-day-view.c:3722 calendar/gui/e-week-view.c:3501
-#: filter/filter.glade.h:15 mail/folder-browser.c:1830
-#: mail/mail-config.glade.h:145 shell/glade/e-folder-list.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
 #: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
 #: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "Δι_αγραφή"
 
@@ -1679,15 +1541,15 @@ msgid "_Web page address:"
 msgstr "_Διεύθυνση Ιστοσελίδας:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
-#: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:362
-#: addressbook/gui/widgets/e-minicard.c:176
-#: addressbook/gui/widgets/e-minicard-label.c:151
-#: addressbook/gui/widgets/e-minicard-view.c:472
-#: addressbook/gui/widgets/e-minicard-view-widget.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:183
 msgid "Editable"
 msgstr "Επεξεργάσιμο"
 
@@ -2712,48 +2574,48 @@ msgstr "Ζάμπια"
 msgid "Zimbabwe"
 msgstr "Ζιμπάμπουε"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:157
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:141
-#: addressbook/gui/widgets/e-addressbook-model.c:297
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:348
-#: addressbook/gui/widgets/e-addressbook-view.c:179
-#: addressbook/gui/widgets/e-minicard-view.c:458
-#: addressbook/gui/widgets/e-minicard-view-widget.c:104
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:459
 msgid "Book"
 msgstr "Βιβλίο"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:164
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:148
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr "Κάρτα"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:171
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
 msgid "Is New Card"
 msgstr "Είναι νέα κάρτα"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
 msgid "Writable Fields"
 msgstr "Εγγράψιμα Πεδία"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:192
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
 msgid "Changed"
 msgstr "Αλλάχθηκε"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:814
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Ο επεξεργαστής κατηγορίας δεν είναι διαθέσιμος."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "Αυτή η επαφή ανήκει στις κατηγορίες:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:997
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Αποθήκευση Επαφής ως VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1043
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2761,7 +2623,7 @@ msgstr ""
 "Είστε βέβαιοι ότι θέλετε\n"
 "να διαγραφούν αυτές οι επαφές?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1046
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2769,24 +2631,24 @@ msgstr ""
 "Είστε βέβαιοι ότι θέλετε\n"
 "να διαγραφεί η επαφή;"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Δε βρέθηκε συστατικό για το πεδίο: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Γρήγορη Προσθήκη Επαφής"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Πλήρης Επεξεργασία"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -2796,15 +2658,15 @@ msgid "Error saving %s: %s"
 msgstr "Σφάλμα αποθήκευσης  %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "λίστα"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:211
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2813,7 +2675,7 @@ msgstr ""
 "Το %s υπάρχει ήδη.\n"
 "Θέλετε να αντικατασταθεί;"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 msgid "Overwrite"
 msgstr "Αντικατάσταση"
 
@@ -2917,42 +2779,42 @@ msgstr "_Κατάληξη:"
 msgid "_Title:"
 msgstr "_Τίτλος:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "List _name:"
 msgstr "Λίστα _ονόματος:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Members"
 msgstr "Μέλη"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 "Πληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Απόκρυψη διευθύνσεων κατά την αποστολή σε αυτή τη λίστα"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "Α_φαίρεση"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "contact-list-editor"
 msgstr "επεξεργαστής-λίστας-επαφών"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:155
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 msgid "Is New List"
 msgstr "Είναι Νέα Λίστα"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:241
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 msgid "Contact List Editor"
 msgstr "Επεξεργαστής Λίστας Επαφών"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:455
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Αποθήκευση Λίστας ως Vcard"
 
@@ -3005,144 +2867,145 @@ msgstr ""
 "Το αλλαγμένο όνομα ή η διεύθυνση e-mail αυτής της επαφής υπάρχει\n"
 "ήδη σε αυτόν τον φάκελο.  Θέλετε οπωσδήποτε να προστεθεί;"
 
+#. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:117
-#: widgets/misc/e-filter-bar.c:150
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:155
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Καμία κάρτα"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:158
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 κάρτα"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:161
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d κάρτες"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:355
-#: addressbook/gui/widgets/e-addressbook-view.c:186
-#: addressbook/gui/widgets/e-minicard-view.c:465
-#: addressbook/gui/widgets/e-minicard-view-widget.c:111
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:466
 msgid "Query"
 msgstr "Ερώτημα"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:441
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 msgid "Error getting book view"
 msgstr "Σφάλμα λήψης όψης βιβλίου"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:369
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 msgid "Model"
 msgstr "Μοντέλο"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:143
-#: addressbook/gui/widgets/e-addressbook-util.c:104
-#: addressbook/gui/widgets/e-minicard.c:512
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Σφάλμα τροποποίησης κάρτας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1150
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Επιτυχία"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:519 shell/e-shell.c:2098
-#: shell/e-storage.c:606 shell/evolution-shell-component.c:1189
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr "Άγνωστο Σφάλμα"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Αρχείο φύλαξης εκτός δικτύου"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:592
-#: shell/evolution-shell-component.c:1180
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "Δεν επιτρέπεται η πρόσβαση"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Η κάρτα δεν βρέθηκε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Το αναγνωριστικό κάρτας υπάρχει ήδη"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Δεν υποστηρίζεται το πρωτόκολλο"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1185
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2297
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
 #: camel/camel-service.c:737 camel/camel-service.c:779
-#: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: camel/camel-service.c:849 camel/camel-service.c:892
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Η πιστοποίηση απέτυχε."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Απαιτείται πιστοποίηση"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS δεν είναι διαθέσιμο"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Το ευρετήριο διευθύνσεων δεν υπάρχει"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Άλλο σφάλμα"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:74
-#: calendar/gui/dialogs/save-comp.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr "Α_πόρριψη"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Σφάλμα προσθήκης λίστας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-util.c:271
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Σφάλμα προσθήκης κάρτας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:104
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Σφάλμα τροποποίησης λίστας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:114
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Σφάλμα κατάργησης λίστας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:114
-#: addressbook/gui/widgets/e-addressbook-util.c:229
-#: addressbook/gui/widgets/e-addressbook-view.c:1740
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Σφάλμα αφαίρεσης κάρτας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:196
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -3151,124 +3014,132 @@ msgstr ""
 "Το άνοιγμα %d καρτών θα ανοίξει και %d νέα παράθυρα.\n"
 "Θέλετε πραγματικά να εμφανίσετε όλες αυτές τις κάρτες?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:327
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Μετακίνηση κάρτας σε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Αντιγραφή κάρτας σε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:332
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Μετακίνηση καρτών σε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Αντιγραφή καρτών σε"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:193
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Πολλαπλές Εκάρτες"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard για %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Τύπος"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:861
-#: addressbook/gui/widgets/e-addressbook-view.c:1868
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Αποθήκευση ως (VCard)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:848
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
 msgstr "Νέα Επαφή..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:849
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
 msgstr "Νέα Λίστα Επαφών..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Go to Folder..."
 msgstr "Μετάβαση στον Φάκελο..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Import..."
 msgstr "Εισαγωγή..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
 msgstr "Αναζήτηση  για επαφές"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Addressbook Sources..."
 msgstr "Πηγές βιβλίου διευθύνσεων..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Pilot Settings..."
 msgstr "Ρυθμίσεις Pilot ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Προώθηση Επαφής"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Αποστολή Μηνύματος στη Επαφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Εκτύπωση Φακέλου"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Copy to folder..."
 msgstr "Αντιγραφή στο Φάκελο..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Move to folder..."
 msgstr "Μετακίνηση στο Φάκελο..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:877 filter/libfilter-i18n.h:10
-#: mail/mail-accounts.c:220 shell/e-shell-folder-commands.c:407
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
-#: calendar/gui/e-day-view.c:3682 calendar/gui/e-week-view.c:3466
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 msgid "Current View"
 msgstr "Τρέχουσα Προβολή"
 
@@ -3276,7 +3147,7 @@ msgstr "Τρέχουσα Προβολή"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3284,11 +3155,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1321
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3360,59 +3231,55 @@ msgstr "Άλλο Τηλέφωνο"
 msgid "Primary Phone"
 msgstr "Πρωτεύον Τηλέφωνο"
 
-#: addressbook/gui/widgets/e-minicard.c:139
-#: addressbook/gui/widgets/e-minicard-label.c:102
-msgid "Width"
-msgstr "Πλάτος"
-
-#: addressbook/gui/widgets/e-minicard.c:146
-#: addressbook/gui/widgets/e-minicard-label.c:109
-msgid "Height"
-msgstr "Ύψος"
-
-#: addressbook/gui/widgets/e-minicard.c:154
-#: addressbook/gui/widgets/e-minicard-label.c:116
-msgid "Has Focus"
-msgstr "Έχει εστίαση"
-
-#: addressbook/gui/widgets/e-minicard.c:162
-msgid "Selected"
-msgstr "Επιλεγμένα"
-
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Cursor"
-msgstr "Έχει δρομέα"
-
-#: addressbook/gui/widgets/e-minicard-control.c:203
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr "και %d άλλες κάρτες."
 
-#: addressbook/gui/widgets/e-minicard-control.c:205
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "και άλλη μία κάρτα."
 
-#: addressbook/gui/widgets/e-minicard-control.c:319
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "Αποθήκευση στο Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/widgets/e-minicard-label.c:123
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+msgid "Width"
+msgstr "Πλάτος"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+msgid "Height"
+msgstr "Ύψος"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr "Έχει εστίαση"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Πεδίο"
 
-#: addressbook/gui/widgets/e-minicard-label.c:130
+#: addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr " Όνομα πεδίου"
 
-#: addressbook/gui/widgets/e-minicard-label.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Μοντέλο Κειμένου"
 
-#: addressbook/gui/widgets/e-minicard-label.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Μέγιστο μάκρος ονόματος πεδίου"
 
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Πλάτος στήλης"
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -3426,7 +3293,7 @@ msgstr ""
 "\n"
 "Κάντε κλικ εδώ για να προσθέσετε μια νέα Επαφή"
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 msgid ""
 "\n"
 "\n"
@@ -3436,32 +3303,41 @@ msgstr ""
 "\n"
 "Δεν υπάρχουν στοιχεία προς εμφάνιση σε αυτή την προβολή"
 
-#: addressbook/gui/widgets/e-minicard-view.c:451
+#: addressbook/gui/widgets/e-minicard-view.c:452
 msgid "Adapter"
 msgstr "Προσαρμογέας"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
-msgid "Column Width"
-msgstr "Πλάτος στήλης"
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr "Επιλεγμένα"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr "Έχει δρομέα"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Προβολή Κάρτας"
 
-#: addressbook/printing/e-contact-print.c:1118
-msgid "Print cards"
-msgstr "Εκτύπωση καρτών"
-
-#: addressbook/printing/e-contact-print.c:1180
-#: addressbook/printing/e-contact-print.c:1202
-msgid "Print card"
-msgstr "Εκτύπωση κάρτας"
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#, fuzzy
+msgid "GTK Tree View"
+msgstr "Προβολή Εβδομάδας"
 
 #: addressbook/printing/e-contact-print-envelope.c:216
 #: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Εκτύπωση φακέλου"
 
+#: addressbook/printing/e-contact-print.c:1130
+msgid "Print cards"
+msgstr "Εκτύπωση καρτών"
+
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
+msgid "Print card"
+msgstr "Εκτύπωση κάρτας"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3531,7 +3407,6 @@ msgid "Include:"
 msgstr "Μαζί με:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:638
 msgid "Landscape"
 msgstr "Οριζόντια"
 
@@ -3551,12 +3426,11 @@ msgstr "Περιθώρια"
 msgid "Number of columns:"
 msgstr "Αριθμός στηλών:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:79
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Επιλογές"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:625
 msgid "Orientation"
 msgstr "Προσανατολισμός"
 
@@ -3577,9 +3451,7 @@ msgstr "Χαρτί"
 msgid "Paper source:"
 msgstr "Πηγή Χαρτιού:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:631
 msgid "Portrait"
 msgstr "Κατακόρυφα"
 
@@ -3635,47 +3507,171 @@ msgstr "Πλάτος:"
 msgid "_Font..."
 msgstr "_Γραμματοσειρά..."
 
-#: calendar/cal-util/cal-component.c:1216
+#: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Ραντεβού χωρίς τίτλο"
 
-#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr "1η"
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "2η"
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "3η"
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr "4η"
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr "5η"
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr "6η"
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr "7η"
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr "8η"
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr "9η"
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr "10η"
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr "11η"
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr "12η"
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr "13η"
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr "14η"
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr "15η"
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr "16η"
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr "17η"
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr "18η"
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr "19η"
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr "20η"
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr "21η"
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "22η"
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "23η"
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr "24η"
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr "25η"
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr "26η"
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr "27η"
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr "28η"
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr "29η"
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr "30η"
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr "31η"
+
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "Υψηλή"
 
-#: calendar/cal-util/cal-util.c:501 calendar/cal-util/cal-util.c:523
-#: calendar/gui/calendar-model.c:1703
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "Κανονική"
 
-#: calendar/cal-util/cal-util.c:503 calendar/cal-util/cal-util.c:525
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "Χαμηλή"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:519
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 #: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr "Αόριστο"
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Διαχωρισμός Γεγονότων Multi-Day:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Σφάλμα κατά την επικοινωνία με τον εξυπηρετητή ημερολογίου"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
@@ -3684,29 +3680,77 @@ msgstr ""
 msgid "Default Priority:"
 msgstr "Εξ ορισμού Προτεραιότητα"
 
-#: calendar/conduits/todo/todo-conduit.c:951
 #: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Ημερολόγιο και Εργασίες"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Ρυθμίστε εδώ την Ζώνη ώρας, Ημερολόγιο και Λίστα Εργασιών σας."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Ημερολόγιο και Εργασίες"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Συστατικό για την προβολή φακέλου μηνυμάτων του Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Συστατικό του Evolution για το εργοστάσιο φακέλου μηνυμάτων."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Προβολή iTip/iMip ημερολογίου Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Προβολή iTip/iMip ημερολογίου Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Προβολή iTip/iMip ημερολογίου Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Συναγερμός Evolution "
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Εργοστάσιο για την υπηρεσία υπενθύμισης ειδοποίησης"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Starting:"
 msgstr "Εκκίνηση:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Ending:"
 msgstr "Τέλος:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:228
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr "μη-έγκυρη ώρα"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 msgid "Evolution Alarm"
 msgstr "Συναγερμός Evolution "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:368
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
 #, c-format
 msgid "Alarm on %s"
 msgstr "Ειδοποίηση στις %s"
@@ -3728,17 +3772,17 @@ msgstr "Χρόνος της χρονική μετάθεσης (λεπτά)"
 msgid "_Edit appointment"
 msgstr "Επεξεργασία _ραντεβού"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:679
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Δεν υπάρχει διαθέσιμη περιγραφή."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:741
-#: calendar/gui/alarm-notify/alarm-queue.c:765
-#: calendar/gui/tasks-control.c:455 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:745
+#: calendar/gui/alarm-notify/alarm-queue.c:849
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3750,7 +3794,7 @@ msgstr ""
 "αποστολή e-mail το Evolution θα εμφανίσει ένα παράθυρο\n"
 "διαλόγου με μια κανονική υπενθύμιση."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:771
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3767,35 +3811,42 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για την εκτέλεση του προγράμματος;"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:785
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 msgid "Do not ask me about this program again."
 msgstr "Να μην ξαναγίνει η ερώτηση για αυτό το πρόγραμμα."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.h:1
-msgid "Alarm notification service"
-msgstr "Υπηρεσία υπενθύμισης ειδοποίησης"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr "Εργοστάσιο για την υπηρεσία υπενθύμισης ειδοποίησης"
-
-#: calendar/gui/alarm-notify/notify-main.c:174
+#: calendar/gui/alarm-notify/notify-main.c:173
 msgid "Could not initialize gnome-vfs"
 msgstr "Δεν ήταν δυνατή η προετοιμασία του gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
 msgstr "Δεν ήταν δυνατή η δημιουργία του εργοστασίου της υπηρεσίας ειδοποίησης"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Η Περίληψη περιέχει"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Η περιγραφή περιέχει"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Το σχόλιο περιέχει"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr "Αταίριαστο"
+
 #: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view.c:1384
-#: calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-week-view-main-item.c:311
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%d %a %b"
 
@@ -3813,7 +3864,7 @@ msgstr "%d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:432
-#: calendar/gui/e-week-view-main-item.c:319 calendar/gui/print.c:1489
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3824,67 +3875,155 @@ msgstr ""
 "Δεν ήταν δυνατό να δημιουργηθεί προβολή ημερολογίου. Παρακαλώ ελέγξτε την "
 "εγκατάσταση του ORBit and OAF"
 
-#: calendar/gui/calendar-model.c:406 calendar/gui/calendar-model.c:965
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
+msgid "Calendar"
+msgstr "Ημερολόγιο"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "Φάκελος που περιέχει ραντεβού και γεγονότα"
+
+#: calendar/gui/calendar-component.c:75
+msgid "Public Calendar"
+msgstr "Κοινόχρηστο ημερολόγιο"
+
+#: calendar/gui/calendar-component.c:76
+msgid "Public folder containing appointments and events"
+msgstr "Δημόσιος φάκελος που περιέχει ραντεβού και γεγονότα"
+
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
+msgid "Tasks"
+msgstr "Εργασίες"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "Φάκελος που περιέχει στοιχεία προς-υλοποίηση"
+
+#: calendar/gui/calendar-component.c:85
+msgid "Public Tasks"
+msgstr "Κοινόχρηστες εργασίες"
+
+#: calendar/gui/calendar-component.c:86
+msgid "Public folder containing to-do items"
+msgstr "Φάκελος που περιέχει στοιχεία προς-υλοποίηση"
+
+#: calendar/gui/calendar-component.c:730
+msgid "New appointment"
+msgstr "Νέο Ραντεβού"
+
+#: calendar/gui/calendar-component.c:730
+msgid "_Appointment"
+msgstr "Ρ_αντεβού"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Δημιουργία νέου ραντεβού"
+
+#: calendar/gui/calendar-component.c:735
+msgid "New meeting"
+msgstr "Νέα συνάντηση"
+
+#: calendar/gui/calendar-component.c:735
+msgid "_Meeting"
+msgstr "_Συνάντηση"
+
+#: calendar/gui/calendar-component.c:736
+msgid "Create a new meeting request"
+msgstr "Δημιουργία νέας αίτησης συνάντησης"
+
+#: calendar/gui/calendar-component.c:740
+msgid "New task"
+msgstr "Νέα Εργασία"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_Εργασία"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Δημιουργία νέας εργασίας"
+
+#: calendar/gui/calendar-component.c:745
+msgid "New All Day Appointment"
+msgstr "Νέο All Day Ραντεβού"
+
+#: calendar/gui/calendar-component.c:745
+msgid "All _Day Appointment"
+msgstr "All _Day Ραντεβού"
+
+#: calendar/gui/calendar-component.c:746
+msgid "Create a new all-day appointment"
+msgstr "Δημιουργία ένος νέου all-day ραντεβού"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
 #: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Ιδιωτικό"
 
-#: calendar/gui/calendar-model.c:409 calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
 #: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Εμπιστευτικό"
 
-#: calendar/gui/calendar-model.c:412 calendar/gui/e-calendar-table.c:371
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
 msgid "Public"
 msgstr "Δημόσιο"
 
-#: calendar/gui/calendar-model.c:524
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "Β"
 
-#: calendar/gui/calendar-model.c:524
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "Ν"
 
-#: calendar/gui/calendar-model.c:526
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "Α"
 
-#: calendar/gui/calendar-model.c:526
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "Δ"
 
-#: calendar/gui/calendar-model.c:591 calendar/gui/calendar-model.c:1135
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
 #: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "Διαθέσιμη"
 
-#: calendar/gui/calendar-model.c:593 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
 #: calendar/gui/e-meeting-time-sel.c:407
-#: shell/evolution-shell-component.c:1174
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr "Απασχολημένη"
 
-#: calendar/gui/calendar-model.c:744 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2288
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "Δεν έχει ξεκινήσει"
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1181
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2291
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "Σε εξέλιξη"
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:305
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/print.c:2294
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
 
-#: calendar/gui/calendar-model.c:1037
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3895,32 +4034,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1177 calendar/gui/dialogs/meeting-page.c:288
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1994
-#: mail/folder-browser.c:1792 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1655 mail/mail-accounts.c:389
-#: mail/mail-config.glade.h:75
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:196
-#: widgets/misc/e-cell-date-edit.c:254 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1471 widgets/misc/e-dateedit.c:1586
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:79
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "Κανένα"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Επανάληψη"
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Ανάθεση"
 
-#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:277
-#: calendar/gui/e-meeting-model.c:287 calendar/gui/e-meeting-model.c:543
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
 #: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr "Ναι"
 
-#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
 #: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Όχι"
@@ -3941,301 +4080,109 @@ msgstr "Προβολή Εβδομάδας"
 msgid "Month View"
 msgstr "Προβολή Μήνα"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Η Περίληψη περιέχει"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Η περιγραφή περιέχει"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Το σχόλιο περιέχει"
-
-#: calendar/gui/cal-search-bar.c:356 mail/mail-ops.c:1106
-msgid "Unmatched"
-msgstr "Αταίριαστο"
-
-#: calendar/gui/calendar-component.c:71 calendar/gui/gnome-cal.c:1341
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1083
-msgid "Calendar"
-msgstr "Ημερολόγιο"
-
-#: calendar/gui/calendar-component.c:72
-msgid "Folder containing appointments and events"
-msgstr "Φάκελος που περιέχει ραντεβού και γεγονότα"
-
-#: calendar/gui/calendar-component.c:76
-msgid "Public Calendar"
-msgstr "Κοινόχρηστο ημερολόγιο"
-
-#: calendar/gui/calendar-component.c:77
-msgid "Public folder containing appointments and events"
-msgstr "Δημόσιος φάκελος που περιέχει ραντεβού και γεγονότα"
-
-#: calendar/gui/calendar-component.c:81 calendar/gui/e-tasks.c:735
-#: calendar/gui/print.c:1775 calendar/gui/tasks-control.c:509
-#: calendar/importers/icalendar-importer.c:705
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:326
-#: my-evolution/e-summary-tasks.c:344 shell/e-local-storage.c:183
-#: shell/e-shortcuts.c:1084
-msgid "Tasks"
-msgstr "Εργασίες"
-
-#: calendar/gui/calendar-component.c:82
-msgid "Folder containing to-do items"
-msgstr "Φάκελος που περιέχει στοιχεία προς-υλοποίηση"
-
-#: calendar/gui/calendar-component.c:86
-msgid "Public Tasks"
-msgstr "Κοινόχρηστες εργασίες"
-
-#: calendar/gui/calendar-component.c:87
-msgid "Public folder containing to-do items"
-msgstr "Φάκελος που περιέχει στοιχεία προς-υλοποίηση"
-
-#: calendar/gui/calendar-component.c:739
-msgid "New appointment"
-msgstr "Νέο Ραντεβού"
-
-#: calendar/gui/calendar-component.c:739
-msgid "_Appointment"
-msgstr "Ρ_αντεβού"
-
-#: calendar/gui/calendar-component.c:740
-msgid "Create a new appointment"
-msgstr "Δημιουργία νέου ραντεβού"
-
-#: calendar/gui/calendar-component.c:744
-msgid "New meeting"
-msgstr "Νέα συνάντηση"
-
-#: calendar/gui/calendar-component.c:744
-msgid "_Meeting"
-msgstr "_Συνάντηση"
-
-#: calendar/gui/calendar-component.c:745
-msgid "Create a new meeting request"
-msgstr "Δημιουργία νέας αίτησης συνάντησης"
-
-#: calendar/gui/calendar-component.c:749
-msgid "New task"
-msgstr "Νέα Εργασία"
-
-#: calendar/gui/calendar-component.c:749
-msgid "_Task"
-msgstr "_Εργασία"
-
-#: calendar/gui/calendar-component.c:750
-msgid "Create a new task"
-msgstr "Δημιουργία νέας εργασίας"
-
-#: calendar/gui/calendar-component.c:754
-msgid "New All Day Appointment"
-msgstr "Νέο All Day Ραντεβού"
+#: calendar/gui/comp-editor-factory.c:456
+#, fuzzy
+msgid "Error while opening the calendar"
+msgstr "Σφάλμα κατά την επικοινωνία με τον εξυπηρετητή ημερολογίου"
 
-#: calendar/gui/calendar-component.c:754
-msgid "All _Day Appointment"
-msgstr "All _Day Ραντεβού"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
 
-#: calendar/gui/calendar-component.c:755
-msgid "Create a new all-day appointment"
-msgstr "Δημιουργία ένος νέου all-day ραντεβού"
+#: calendar/gui/comp-editor-factory.c:473
+#, fuzzy
+msgid "Permission denied to open the calendar"
+msgstr "Δεν επιτρέπεται η πρόσβαση"
 
 #: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Αδύνατο το άνοιγμα φακέλου στο `%s'"
 
-#: calendar/gui/control-factory.c:163
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "Το URI που θα εμφανίσει το ημερολόγιο"
 
-#: calendar/gui/control-factory.c:170
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Ο τύπος της προβολής για εμφάνιση"
 
-#: calendar/gui/dialogs/alarm-options.c:358
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Επιλογές Ηχητικής Ειδοποίησης"
 
-#: calendar/gui/dialogs/alarm-options.c:367
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Επιλογές Ειδοποίησης Μηνύματος"
 
-#: calendar/gui/dialogs/alarm-options.c:376
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Επιλογές Ειδοποίησης Ταχυδρομείου"
 
-#: calendar/gui/dialogs/alarm-options.c:385
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Επιλογές Ειδοποίησης Προγράμματος"
 
-#: calendar/gui/dialogs/alarm-options.c:394
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Άγνωστες Επιλογές Ειδοποίησης"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Επανάληψη Ειδοποίησης"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
-msgstr ""
-"Το Evolution δεν υποστηρίζει ακόμα αυτού του είδους υπενθυμίσεις.  Δεν θα "
-"μπορέσετε να επεξεργαστείτε τις επιλογές για αυτή την ειδοποίηση."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Μήνυμα προς Εμφάνιση"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Σώμα Μηνύματος"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Εκτέλεση Ήχου:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Επανάληψη Ειδοποίησης"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Εκτέλεση προγράμματος:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Αποστολή"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Με αυτές τις παραμέτρους:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:68
-#: filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
 msgid "days"
 msgstr "ημέρες"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "επιπλέον φορές κάθε"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:67
-#: filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "ώρες"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:66
-#: filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "λεπτά"
 
-#: calendar/gui/dialogs/alarm-page.c:311
-#, c-format
-msgid "%d days"
-msgstr "%d ημέρες"
-
-#: calendar/gui/dialogs/alarm-page.c:314
-msgid "1 day"
-msgstr "1 ημέρα"
-
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d weeks"
-msgstr "%d εβδομάδες"
-
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 week"
-msgstr "1 εβδομάδα"
-
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d hours"
-msgstr "%d ώρες"
-
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 hour"
-msgstr "1 ώρα"
-
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d minutes"
-msgstr "%d λεπτά"
-
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 minute"
-msgstr "1 λεπτό"
-
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d seconds"
-msgstr "%d δευτερόλεπτα"
-
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 second"
-msgstr "1 δευτερόλεπτο"
-
-#: calendar/gui/dialogs/alarm-page.c:375
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "Εκτέλεση Ήχου"
-
-#: calendar/gui/dialogs/alarm-page.c:379
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Εμφάνιση μηνύματος"
-
-#: calendar/gui/dialogs/alarm-page.c:383
-msgid "Send an email"
-msgstr "Αποστολή e-mail"
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Εκτέλεσε ένα πρόγραμμα"
-
-#: calendar/gui/dialogs/alarm-page.c:393
-msgid "Unknown action to be performed"
-msgstr "Εκτέλεση άγνωστης ενέργειας"
-
-#: calendar/gui/dialogs/alarm-page.c:405
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s πριν την αρχή του ραντεβού"
-
-#: calendar/gui/dialogs/alarm-page.c:408
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s πριν την αρχή του ραντεβού"
-
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s στην αρχή του ραντεβού"
-
-#: calendar/gui/dialogs/alarm-page.c:422
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s πριν το τέλος του ραντεβού"
-
-#: calendar/gui/dialogs/alarm-page.c:425
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s μετά το τέλος του ραντεβού"
-
-#: calendar/gui/dialogs/alarm-page.c:430
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s στο τέλος του ραντεβού"
-
-#: calendar/gui/dialogs/alarm-page.c:454
-#, c-format
-msgid "%s at %s"
-msgstr "%s στις %s"
-
-#: calendar/gui/dialogs/alarm-page.c:460
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s για άγνωστο τύπο ενεργοποίησης"
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4246,46 +4193,63 @@ msgstr "Βασικά"
 msgid "Date/Time:"
 msgstr "Ημερομηνία/Ώρα:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Εμφάνιση μηνύματος"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Εκτέλεση Ήχου"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Υπενθυμίσεις"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Εκτέλεσε ένα πρόγραμμα"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Αποστολή e-mail"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:804 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Περίληψη:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Επιλογές..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "μετά"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "πριν"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "ημέρα(ες)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "τέλος του ραντεβού"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "ώρα(ες)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:177
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "λεπτό(ά)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "αρχή ραντεβού"
 
@@ -4309,7 +4273,7 @@ msgstr "30 λεπτά"
 msgid "60 minutes"
 msgstr "60 λεπτά"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 msgid "Alerts"
 msgstr "Ειδοποιήσεις"
 
@@ -4334,7 +4298,8 @@ msgid "Days"
 msgstr "Ημέρες"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1091
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Παρασκευή"
 
@@ -4347,7 +4312,8 @@ msgid "Minutes"
 msgstr "Λεπτά"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1087
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Δευτέρα"
 
@@ -4356,7 +4322,8 @@ msgid "S_un"
 msgstr "_Κυρ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Σάββατο"
 
@@ -4369,7 +4336,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Εμφάνιση αριθμών εβδομάδων στον περιηγητή ημερολογίου"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1093
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Κυριακή"
 
@@ -4386,7 +4354,8 @@ msgid "Task List"
 msgstr "Λίστα Εργασιών"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Πέμπτη"
 
@@ -4403,7 +4372,8 @@ msgid "Time format:"
 msgstr "Μορφή ώρας:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Τρίτη"
 
@@ -4412,7 +4382,8 @@ msgid "W_eek starts:"
 msgstr "Ε_βδομάδα ξεκινάει:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
@@ -4454,7 +4425,7 @@ msgid "_Fri"
 msgstr "_Παρ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Γενικά"
 
@@ -4494,7 +4465,7 @@ msgstr "_Τετ"
 msgid "before every appointment"
 msgstr "πριν από κάθε ραντεβού"
 
-#: calendar/gui/dialogs/cancel-comp.c:55
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -4502,11 +4473,11 @@ msgstr ""
 "Το γεγονός που διαγράφηκε ήταν μια συνάντηση, θέλετε να στείλετε μια "
 "ειδοποίηση ακύρωσης?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Είστε βέβαιοι για την ακύρωση και διαγραφή της συνάντησης;"
 
-#: calendar/gui/dialogs/cancel-comp.c:64
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -4514,11 +4485,11 @@ msgstr ""
 "Η εργασία που διαγράφηκε είχε ανατεθεί, θέλετε να στείλετε μια ειδοποίηση "
 "ακύρωσης?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Είστε βέβαιοι για την ακύρωση και την διαγραφή της εργασίας;"
 
-#: calendar/gui/dialogs/cancel-comp.c:73
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -4526,7 +4497,7 @@ msgstr ""
 "Η καταχώρηση που διαγράφηκε είχε δημοσιευθεί, θέλετε να στείλετε μια "
 "ειδοποίηση ακύρωσης?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Είστε βέβαιοι για την ακύρωση και την διαγραφή της καταχώρισης του "
@@ -4580,89 +4551,89 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Δεν έχετε κάνει αλλαγές. Να ανανεωθεί ο επεξεργαστής;"
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Άγνωστο πιστοποίησης: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
+msgid " to "
+msgstr " με "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
+msgid " (Completed "
+msgstr "(Ολοκληρωμένο"
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
+msgid "Completed "
+msgstr "Ολοκληρωμένο "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
+msgid " (Due "
+msgstr "(Λήξη"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
+msgid "Due "
+msgstr "Λήξη "
+
+#: calendar/gui/dialogs/comp-editor.c:328
 msgid "Could not update invalid object"
 msgstr "Δεν ήταν δυνατή μη έγκυρου αντικειμένου"
 
-#: calendar/gui/dialogs/comp-editor.c:325
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr "Το αντικείμενο δεν βρέθηκε, δεν έγινε ενημέρωση"
 
-#: calendar/gui/dialogs/comp-editor.c:328
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr "Δεν έχετε δικαιώματα για να ενημερώσετε αυτό το αντικείμενο"
 
-#: calendar/gui/dialogs/comp-editor.c:331
+#: calendar/gui/dialogs/comp-editor.c:337
 msgid "Could not update object"
 msgstr "Δεν ήταν δυνατή η ενημέρωση του αντικειμένου"
 
-#: calendar/gui/dialogs/comp-editor.c:777
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Επεξεργασία Ραντεβού"
 
-#: calendar/gui/dialogs/comp-editor.c:782
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Ραντεβού - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:785
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Εργασία - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:788
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Ημερολογιακή καταχώριση - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Χωρίς περίληψη"
 
-#: calendar/gui/dialogs/comp-editor.c:1200
-#: calendar/gui/e-calendar-table.c:1035 calendar/gui/e-day-view.c:3937
-#: calendar/gui/e-week-view.c:3699 composer/e-msg-composer.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr "Αποθήκευση ως..."
 
-#: calendar/gui/dialogs/comp-editor.c:1301
-#: calendar/gui/dialogs/comp-editor.c:1325
-#: calendar/gui/dialogs/comp-editor.c:1349
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1331
+#: calendar/gui/dialogs/comp-editor.c:1355
+#: calendar/gui/dialogs/comp-editor.c:1379
+#, fuzzy
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Οι αλλαγές που έγιναν σε αυτό το αντικείμενο μπορεί να απορριφθούν αν "
 "καταφθάσει μια ενημέρωση μέσω email"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "Δεν ήταν δυνατό να αποκτηθεί η τρέχουσα έκδοση!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Άγνωστο πιστοποίησης: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2206
-msgid " to "
-msgstr " με "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2210
-msgid " (Completed "
-msgstr "(Ολοκληρωμένο"
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2212
-msgid "Completed "
-msgstr "Ολοκληρωμένο "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2217
-msgid " (Due "
-msgstr "(Λήξη"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2219
-msgid "Due "
-msgstr "Λήξη "
-
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4718,103 +4689,98 @@ msgstr "Εξουσιοδότηση Σε:"
 msgid "Enter Delegate"
 msgstr "Εισαγωγή Αντιπροσώπου"
 
-#: calendar/gui/dialogs/event-editor.c:197 calendar/gui/print.c:2245
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "Ραντεβού"
 
-#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Υπενθύμιση"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Επανεμφάνιση"
 
-#: calendar/gui/dialogs/event-editor.c:212
-#: calendar/gui/dialogs/event-editor.c:279
-#: calendar/gui/dialogs/event-editor.c:413
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr "Δρομολόγηση"
 
-#: calendar/gui/dialogs/event-editor.c:217
-#: calendar/gui/dialogs/event-editor.c:282
-#: calendar/gui/dialogs/event-editor.c:416 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Συνάντηση"
 
-#: calendar/gui/dialogs/event-page.c:636 calendar/gui/dialogs/task-page.c:546
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
 msgid "Start date is wrong"
 msgstr "Η ημερομηνία έναρξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "Η ημερομηνία λήξης είναι λάθος"
 
-#: calendar/gui/dialogs/event-page.c:669
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "Η ώρα έναρξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/event-page.c:676
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "Η ώρα λήξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "Γεγονός ολόκληρης ημέρας"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "Απασχολημένος"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Ταξινόμηση"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "_Εμπιστευτικό"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Ημερομηνία & Ώρα"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "_Ελεύθερο"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "Τ_οποθεσία"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Ιδιωτι_κό"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Δημόσιο"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Εμφάνιση Ώρας Ως"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Περ_ίληψη:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "Επα_φές..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "_Χρόνος Λήξης:"
@@ -4823,19 +4789,23 @@ msgstr "_Χρόνος Λήξης:"
 msgid "_Start time:"
 msgstr "Χρόνος Έ_ναρξης:"
 
-#: calendar/gui/dialogs/meeting-page.c:393
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr "Χρειάζεται ένας διοργανωτής."
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "Απαιτείται τουλάχιστον ένας παρευρισκόμενος."
 
-#: calendar/gui/dialogs/meeting-page.c:573
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "Αυτό το άτομο είναι ήδη σε συνάντηση!"
 
-#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Εξουσιοδότηση Σε..."
 
@@ -4875,14 +4845,14 @@ msgid "Member"
 msgstr "Μέλος"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Κατάσταση"
@@ -4901,96 +4871,81 @@ msgstr "Αλλάξτε Διοργανωτή"
 msgid "_Invite Others..."
 msgstr "_Πρόσκληση Άλλων..."
 
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:162
-msgid "st"
-msgstr "η"
-
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:153
-msgid "nd"
-msgstr "η"
-
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:154
-msgid "rd"
-msgstr "η"
-
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:147
-#: calendar/gui/dialogs/recurrence-page.c:148
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:155
-#: calendar/gui/dialogs/recurrence-page.c:156
-#: calendar/gui/dialogs/recurrence-page.c:157
-#: calendar/gui/dialogs/recurrence-page.c:158
-#: calendar/gui/dialogs/recurrence-page.c:159
-#: calendar/gui/dialogs/recurrence-page.c:160
-#: calendar/gui/dialogs/recurrence-page.c:161
-msgid "th"
-msgstr "η"
-
-#: calendar/gui/dialogs/recurrence-page.c:582
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:75
+#, fuzzy
+msgid "This and Future Instances"
+msgstr "Νήσοι Γουάλις και Φουτούνα"
+
+#: calendar/gui/dialogs/recur-comp.c:77
+#, fuzzy
+msgid "All Instances"
+msgstr "Για Προχωρημένους"
+
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Αυτή η συνάντηση περιέχει επαναλήψεις που το Evolution δεν μπορεί να "
 "επεξεργαστεί."
 
-#: calendar/gui/dialogs/recurrence-page.c:858
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+#, fuzzy
+msgid "Recurrence date is invalid"
 msgstr "Η επαναλαμβανόμενη ημερομηνία είναι λάθος"
 
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "στο"
 
-#: calendar/gui/dialogs/recurrence-page.c:1028
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr "πρώτη"
 
-#: calendar/gui/dialogs/recurrence-page.c:1029 filter/filter-datespec.c:65
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "δευτερόλεπτο"
 
-#: calendar/gui/dialogs/recurrence-page.c:1030
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr "τρίτη"
 
-#: calendar/gui/dialogs/recurrence-page.c:1031
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr "τέταρτη"
 
-#: calendar/gui/dialogs/recurrence-page.c:1032
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr "τελευταία"
 
-#: calendar/gui/dialogs/recurrence-page.c:1058
+#: calendar/gui/dialogs/recurrence-page.c:1004
 msgid "Other Date"
 msgstr "Άλλη ημερομηνία"
 
-#: calendar/gui/dialogs/recurrence-page.c:1086 filter/filter-datespec.c:68
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "ημέρα"
 
-#: calendar/gui/dialogs/recurrence-page.c:1226
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "στο"
 
-#: calendar/gui/dialogs/recurrence-page.c:1411
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "εμφανίσεις"
 
@@ -5054,26 +5009,26 @@ msgstr "εβδομάδα(ες)"
 msgid "year(s)"
 msgstr "χρόνος(ια)"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr "Η πληροφορίες της συνάντησης έχουν δημιουργηθεί. Να αποσταλούν?"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Η πληροφορίες της συνάντησης έχουν αλλάζει. Να αποσταλεί ενημερωμένη έκδοση;"
 
-#: calendar/gui/dialogs/send-comp.c:65
+#: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 "Οι πληροφορίες της ανάθεσης εργασίας έχουν δημιουργηθεί. Να αποσταλούν;"
 
-#: calendar/gui/dialogs/send-comp.c:69
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Η πληροφορίες της εργασία έχει αλλάξει. Να αποσταλεί ενημερωμένη έκδοση;"
 
-#: calendar/gui/dialogs/task-details-page.c:398
+#: calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "Η συμπληρωμένη ημερομηνία είναι λανθασμένη"
 
@@ -5087,46 +5042,40 @@ msgstr "% Ολοκληρωμένο"
 msgid "Date Completed:"
 msgstr "Ολοκληρώθηκε την:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:295 calendar/gui/e-meeting-model.c:318
-#: calendar/gui/e-meeting-model.c:549 calendar/gui/e-meeting-model.c:851
-msgid "Needs Action"
-msgstr "Απαιτεί Ενέργεια"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Πρόοδος"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:630
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Προτεραιότητα"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Κατάσταση:"
 
-#: calendar/gui/dialogs/task-editor.c:186
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Βασικό"
 
-#: calendar/gui/dialogs/task-editor.c:196
-#: calendar/gui/dialogs/task-editor.c:241
-#: calendar/gui/dialogs/task-editor.c:366
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr "Εργασία"
 
-#: calendar/gui/dialogs/task-page.c:519
+#: calendar/gui/dialogs/task-page.c:527
 msgid "Due date is wrong"
 msgstr "Η ημερομηνία λήξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:858
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Περιγραφή:"
 
@@ -5134,124 +5083,232 @@ msgstr "Περιγραφή:"
 msgid "Sta_rt Date:"
 msgstr "Ημερομηνία Έ_ναρξης:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "Επα_φές..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Ημερομηνία _Λήξης:"
 
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d ημέρες"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 ημέρα"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d εβδομάδες"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 εβδομάδα"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d ώρες"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 ώρα"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d λεπτά"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 λεπτό"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d δευτερόλεπτα"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 δευτερόλεπτο"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Αποστολή e-mail"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Εκτέλεση άγνωστης ενέργειας"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s πριν την αρχή του ραντεβού"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s πριν την αρχή του ραντεβού"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s στην αρχή του ραντεβού"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s πριν το τέλος του ραντεβού"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s μετά το τέλος του ραντεβού"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s στο τέλος του ραντεβού"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s στις %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s για άγνωστο τύπο ενεργοποίησης"
+
 #: calendar/gui/e-calendar-table.c:415
+#, c-format
 msgid "0%"
 msgstr "0%"
 
 #: calendar/gui/e-calendar-table.c:416
+#, c-format
 msgid "10%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:417
+#, c-format
 msgid "20%"
 msgstr "20%"
 
 #: calendar/gui/e-calendar-table.c:418
+#, c-format
 msgid "30%"
 msgstr "30%"
 
 #: calendar/gui/e-calendar-table.c:419
+#, c-format
 msgid "40%"
 msgstr "40%"
 
 #: calendar/gui/e-calendar-table.c:420
+#, c-format
 msgid "50%"
 msgstr "50%"
 
 #: calendar/gui/e-calendar-table.c:421
+#, c-format
 msgid "60%"
 msgstr "60%"
 
 #: calendar/gui/e-calendar-table.c:422
+#, c-format
 msgid "70%"
 msgstr "70%"
 
 #: calendar/gui/e-calendar-table.c:423
+#, c-format
 msgid "80%"
 msgstr "80%"
 
 #: calendar/gui/e-calendar-table.c:424
+#, c-format
 msgid "90%"
 msgstr "90%"
 
 #: calendar/gui/e-calendar-table.c:425
+#, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2821
-#: calendar/gui/e-week-view.c:1863
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1910
 msgid "Deleting selected objects"
 msgstr "Διαγραφή επιλεγμένων αντικειμένων"
 
-#: calendar/gui/e-calendar-table.c:949 calendar/gui/e-day-view.c:3704
-#: calendar/gui/e-week-view.c:3483 mail/folder-browser.c:1803
-#: shell/e-shortcuts-view.c:409 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Άνοιγμα"
 
-#: calendar/gui/e-calendar-table.c:950
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr "Αποθήκευ_ση ως..."
 
-#: calendar/gui/e-calendar-table.c:951 calendar/gui/e-day-view.c:3706
-#: calendar/gui/e-week-view.c:3458 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Εκτύπωση..."
 
-#: calendar/gui/e-calendar-table.c:955 calendar/gui/e-day-view.c:3711
-#: calendar/gui/e-week-view.c:3490 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Αποκοπή"
 
-#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
-#: calendar/gui/e-week-view.c:3491 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "Αντιγραφή"
 
-#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3677
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3462
-#: calendar/gui/e-week-view.c:3492 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "Επικόλληση"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr "_Ανάθεση Εργασίας"
 
-#: calendar/gui/e-calendar-table.c:962
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr "Προώ_θηση ως i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:963
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "_Σημείωση ως Ολοκληρωμένο"
 
-#: calendar/gui/e-calendar-table.c:964
+#: calendar/gui/e-calendar-table.c:965
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Σημείωση επιλεγμένων εργασιών ως ολοκληρωμένες"
 
-#: calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "_Διαγραφή Επιλεγμένων Εργασιών"
 
-#: calendar/gui/e-calendar-table.c:1239 calendar/gui/e-day-view.c:7536
-#: calendar/gui/e-week-view.c:4177
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr "Αναβάθμιση Αντικειμένων"
 
-#: calendar/gui/e-calendar-table.c:1322
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Κλικ εδώ για προσθήκη εργασίας"
@@ -5260,8 +5317,8 @@ msgstr "Κλικ εδώ για προσθήκη εργασίας"
 msgid "Alarms"
 msgstr "Ειδοποιήσεις"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1000
-#: camel/camel-filter-driver.c:1095
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Ολοκληρώθηκε"
 
@@ -5290,8 +5347,8 @@ msgid "Start Date"
 msgstr "Ημερομηνία Έναρξης"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:54 shell/e-shell.c:763
-#: shell/e-shortcuts.c:1080
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Περίληψη"
 
@@ -5322,133 +5379,211 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:613 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:789
-msgid "am"
-msgstr "πμ"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:616 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:791
-msgid "pm"
-msgstr "μμ"
+#: calendar/gui/e-day-view-time-item.c:529
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i τμήματα λεπτών"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1370 calendar/gui/e-day-view-top-item.c:261
-#: calendar/gui/e-week-view-main-item.c:302 calendar/gui/print.c:1505
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1397 calendar/gui/e-day-view-top-item.c:269
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3661
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
+msgid "am"
+msgstr "πμ"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
+msgid "pm"
+msgstr "μμ"
+
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Νέο Ρ_ραντεβού"
 
-#: calendar/gui/e-day-view.c:3663 calendar/gui/e-week-view.c:3452
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "Νέο _Γεγονός Ολόκληρης της Ημέρας"
 
-#: calendar/gui/e-day-view.c:3665 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 msgid "New Meeting"
 msgstr "Νέα Συνάντηση"
 
-#: calendar/gui/e-day-view.c:3667 calendar/gui/e-week-view.c:3454
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "Νέα Εργασία"
 
-#: calendar/gui/e-day-view.c:3672 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Εκτύπωση..."
 
-#: calendar/gui/e-day-view.c:3684 calendar/gui/e-week-view.c:3468
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Μετάβαση στο _Σήμερα"
 
-#: calendar/gui/e-day-view.c:3686 calendar/gui/e-week-view.c:3469
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "_Μετάβαση στην Ημερομηνία..."
 
-#: calendar/gui/e-day-view.c:3691 calendar/gui/e-week-view.c:3473
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "Δημο_σίευση πληροφοριών Διαθεσιμότητας"
 
-#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3477
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
+#: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Ρυθμίσεις..."
 
-#: calendar/gui/e-day-view.c:3705 calendar/gui/e-week-view.c:3484
-#: mail/folder-browser.c:1805 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Α_ποθήκευση ως..."
 
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3496
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 msgid "_Schedule Meeting..."
 msgstr "Προγραμματισμός _Συνάντησης..."
 
-#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3497
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 msgid "_Forward as iCalendar..."
 msgstr "Προώ_θηση ως iCalendar"
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3502
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr "Να γίνει αυτή η Εμφάνιση _Μετακινήσιμη"
 
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3503
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr "Διαγραφή αυτής της _Εμφάνισης"
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3504
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr "Διαγραφή Ό_λων των Εμφανίσεων"
 
-#: calendar/gui/e-day-view-time-item.c:498
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "_Απλή επανεμφάνιση"
+
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "Κάθε"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d ημέρες"
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "Κάθε"
+
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr "%d εβδομάδες"
+
+#: calendar/gui/e-itip-control.c:729
+msgid "Every week on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:731
+#, fuzzy, c-format
+msgid "Every %d weeks on "
+msgstr "%d εβδομάδες"
+
+#: calendar/gui/e-itip-control.c:739
+#, fuzzy
+msgid " and "
+msgstr "Άμμος"
+
+#: calendar/gui/e-itip-control.c:746
 #, c-format
-msgid "%02i minute divisions"
-msgstr "%02i τμήματα λεπτών"
+msgid "The %s day of "
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:585
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:764
+#, fuzzy
+msgid "every month"
+msgstr "Ένας Μήνας"
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:775
+#, fuzzy
+msgid "Every year"
+msgstr "Κάθε"
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr "<b>Ξεκινάει:</b> "
 
-#: calendar/gui/e-itip-control.c:595
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr "<b>Τελειώνει:</b> "
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr "<b>Ολοκληρώθηκε:</b> "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr "<b>Λήγει:</b> "
 
-#: calendar/gui/e-itip-control.c:655 calendar/gui/e-itip-control.c:705
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "Πληροφορίες iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "Σφάλμα iCalendar"
 
-#: calendar/gui/e-itip-control.c:736 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:763 calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 msgid "An unknown person"
 msgstr "Ένα άγνωστο άτομο"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:787
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5456,342 +5591,342 @@ msgstr ""
 "<br> Παρακαλώ διαβάστε τις παρακάτω πληροφορίες, και επιλέξτε μετά μια "
 "ενέργεια από το παρακάτω μενού."
 
-#: calendar/gui/e-itip-control.c:802
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Κανένα</i>"
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Τοποθεσία: "
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: calendar/gui/e-itip-control.c:831 calendar/gui/e-meeting-model.c:297
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:852
-#: calendar/gui/itip-utils.c:486
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Αποδοχή"
 
-#: calendar/gui/e-itip-control.c:835 calendar/gui/itip-utils.c:489
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Δοκιμαστική αποδοχή"
 
-#: calendar/gui/e-itip-control.c:839 calendar/gui/e-meeting-model.c:299
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:853
-#: calendar/gui/itip-utils.c:492 calendar/gui/itip-utils.c:518
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Άρνηση πρόσβασης"
 
-#: calendar/gui/e-itip-control.c:843 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:268
-#: calendar/gui/e-meeting-model.c:333 calendar/gui/e-meeting-model.c:810
-#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1531
-#: camel/camel-gpg-context.c:1581 camel/camel-tcp-stream-openssl.c:629
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:364
-#: mail/mail-display.c:918 widgets/misc/e-charset-picker.c:59
-#: widgets/misc/e-charset-picker.c:446
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: calendar/gui/e-itip-control.c:896 calendar/gui/e-itip-control.c:924
-#: calendar/gui/e-itip-control.c:950 calendar/gui/e-itip-control.c:963
-#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 msgid "Choose an action:"
 msgstr "Επιλέξτε μια ενέργεια:"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:929
-#: calendar/gui/e-itip-control.c:952 calendar/gui/e-itip-control.c:965
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:991
-#: shell/e-shell.c:2088 widgets/misc/e-cell-date-edit.c:262
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "ΟΚ"
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Αποδοχή"
 
-#: calendar/gui/e-itip-control.c:926
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Δοκιμαστική αποδοχή"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Απόκρυψη"
 
-#: calendar/gui/e-itip-control.c:951
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Αποστολή πληροφοριών Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:964
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Ανανέωση κατάστασης απάντησης"
 
-#: calendar/gui/e-itip-control.c:977
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Αποστολή τελευταίων πληροφοριών"
 
-#: calendar/gui/e-itip-control.c:990 calendar/gui/itip-utils.c:506
-#: shell/evolution-shell-component.c:1152 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> έχει δημοσιεύσει πληροφορίες συνάντησης."
 
-#: calendar/gui/e-itip-control.c:1072
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Πληροφορίες Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> παρακαλεί την παρουσία του %s σε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1079
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> παρακαλεί την παρουσία σας σε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1080
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Πρόταση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Ανανέωση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1089
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> θα ήθελε να παραλάβει τις τελευταίες πληροφορίες συνάντησης."
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Αίτη_ση Ανανέωσης Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> έχει απαντήσει σε μία πρόσκληση σε συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1098
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Απάντηση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ακύρωσε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Ακύρωση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "ο/η <b>%s</b> έστειλε ένα ακατανόητο μήνυμα."
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Εσφαλμένο Μήνυμα Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> έχει δημοσιεύσει πληροφορίες εργασιών."
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Πληροφορίες Εργασιών"
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ζητάει από τον %s να εκτελέσει μια εργασία."
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> σας έχει ζητήσει να εκτελέσετε μια εργασία"
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Πρόταση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα εργασία."
 
-#: calendar/gui/e-itip-control.c:1152
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Ανανέωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> θα ήθελε την τελευταία πληροφορία εργασιών."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Αίτηση _Ανανέωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> απάντησε σε μια ανάθεση εργασίας"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Απάντηση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> έχει ακυρώσει μια εργασία."
 
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Ακύρωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr " Μήνυμα κακής εργασίας"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> έχει δημοσίευση πληροφορίες διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Πληροφορίες Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "ο/η <b>%s</b> ζητά πληροφορίες διαθεσιμότητας."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Αίτηση Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "ο/η <b>%s</b> απάντησε στην αίτηση διαθεσιμότητας."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Απάντηση Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Εσφαλμένο Μήνυμα Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr "Αυτό το μήνυμα δεν φαίνεται να έχει συνταχθεί σωστά."
 
-#: calendar/gui/e-itip-control.c:1352
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Το μήνυμα περιέχει μόνο αιτήσεις που δεν υποστηρίζονται"
 
-#: calendar/gui/e-itip-control.c:1380 calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Το επισυναπτόμενο αρχείο δεν περιέχει έγκυρο αρχείο ημερολογίου"
 
-#: calendar/gui/e-itip-control.c:1411
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 "Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δεν μπορούν να προβληθούν"
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1724
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Το αντικείμενο δεν είναι έγκυρο και δεν μπορεί να ενημερωθεί\n"
 
-#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 msgid "There was an error on the CORBA system\n"
 msgstr "Υπήρξε σφάλμα στο σύστημα CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1638 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 msgid "Object could not be found\n"
 msgstr "Δεν ήταν εύρεση του αντικειμένου\n"
 
-#: calendar/gui/e-itip-control.c:1641
+#: calendar/gui/e-itip-control.c:1916
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να ενημερώσετε το ημερολόγιο\n"
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Η ανανέωση ολοκληρώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:1647
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Δεν ήταν δυνατό να ανανεωθεί\n"
 
-#: calendar/gui/e-itip-control.c:1676 calendar/gui/e-itip-control.c:1742
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων επειδή το στοιχείο "
 "δεν υπάρχει πλέον"
 
-#: calendar/gui/e-itip-control.c:1697
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί?"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη "
 "έγκυρης κατάστασης\n"
 
-#: calendar/gui/e-itip-control.c:1733
+#: calendar/gui/e-itip-control.c:2008
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να ενημερώσετε το ημερολόγιο\n"
 
-#: calendar/gui/e-itip-control.c:1736
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Η κατάσταση παρευρισκομένων ανανεώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:1739
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων\n"
 
-#: calendar/gui/e-itip-control.c:1774
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Η Αφαίρεση Ολοκληρώθηκε"
 
-#: calendar/gui/e-itip-control.c:1804 calendar/gui/e-itip-control.c:1854
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr "Το στοιχείο στάλθηκε!\n"
 
-#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr "Δεν ήταν δυνατή η αποστολή του στοιχείου!\n"
 
-#: calendar/gui/e-itip-control.c:1931
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Επιλογή Φακέλου Ημερολογίου"
 
-#: calendar/gui/e-itip-control.c:1938
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Επιλογή Φακέλου Εργασιών"
 
@@ -5832,77 +5967,104 @@ msgstr "ημερομηνία τέλους"
 msgid "date-start"
 msgstr "ημερομηνία έναρξης"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Άτομα Προεδρείου"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1736
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr "Απαραίτητοι Συμμετέχοντες"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Προαιρετικοί Συμμετέχοντες"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:83
 msgid "Resources"
 msgstr "Πόροι"
 
-#: calendar/gui/e-meeting-model.c:208 calendar/gui/e-meeting-model.c:225
-#: calendar/gui/e-meeting-model.c:539 calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr "Άτομο"
 
-#: calendar/gui/e-meeting-model.c:210 calendar/gui/e-meeting-model.c:227
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
 #: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "Ομάδα"
 
-#: calendar/gui/e-meeting-model.c:212 calendar/gui/e-meeting-model.c:229
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
 #: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "Πόρος"
 
-#: calendar/gui/e-meeting-model.c:214 calendar/gui/e-meeting-model.c:231
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
 #: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr "Αίθουσα"
 
-#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:260
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
 #: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr "Προεδρείο"
 
-#: calendar/gui/e-meeting-model.c:245 calendar/gui/e-meeting-model.c:262
-#: calendar/gui/e-meeting-model.c:541 calendar/gui/e-meeting-model.c:823
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr "Απαραίτητος Συμμετέχων"
 
-#: calendar/gui/e-meeting-model.c:247 calendar/gui/e-meeting-model.c:264
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
 #: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr "Προαιρετικός Συμμετέχων"
 
-#: calendar/gui/e-meeting-model.c:249 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
 #: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr "Μη-Συμμετέχων"
 
-#: calendar/gui/e-meeting-model.c:301 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+msgid "Needs Action"
+msgstr "Απαιτεί Ενέργεια"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
 #: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr "Δοκιμαστικά"
 
-#: calendar/gui/e-meeting-model.c:303 calendar/gui/e-meeting-model.c:326
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
 #: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr "Εξουσιοδοτήθηκε"
 
-#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 msgid "In Process"
 msgstr "Σε Εξέλιξη"
 
-#: calendar/gui/e-meeting-time-sel.c:408
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2092
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
+#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Εκτός Γραφείου"
 
@@ -5914,98 +6076,76 @@ msgstr "Χωρίς Πληροφόρηση"
 msgid "_Options"
 msgstr "_Επιλογές"
 
-#: calendar/gui/e-meeting-time-sel.c:466
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Εμφάνιση _μόνο των ωρών Εργασίας"
 
-#: calendar/gui/e-meeting-time-sel.c:480
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Εμφάνιση Σμίκρυνσης"
 
-#: calendar/gui/e-meeting-time-sel.c:498
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "Ανα_νέωση Διαθεσιμότητας"
 
-#: calendar/gui/e-meeting-time-sel.c:516
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:533
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr "_Αυτόματη επιλογή"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:566
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr "Όλα _τα Άτομα και οι Πόροι"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Όλα τα Άτομα και ένας _Πόρος"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "Απαιτούμενα Άτομα"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Απαιτούμενα Άτομα και ένας Πόρος"
 
-#: calendar/gui/e-meeting-time-sel.c:628
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Χρόνος έ_ναρξης συνάντησης:"
 
-#: calendar/gui/e-meeting-time-sel.c:647
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Χρόνος _περάτωσης συνάντησης:"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2072
-#: calendar/gui/e-meeting-time-sel-item.c:453
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2102
-#: calendar/gui/e-meeting-time-sel-item.c:457 e-util/e-time-utils.c:189
-#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:461 e-util/e-time-utils.c:224
-#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1595
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-tasks.c:356 calendar/gui/gnome-cal.c:2011
-#: calendar/gui/gnome-cal.c:2022
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Άνοιγμα ενεργειών στο %s"
 
-#: calendar/gui/e-tasks.c:385 calendar/gui/tasks-control.c:197
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Αδύνατη η φόρτωση ενεργειών στο `%s'"
 
-#: calendar/gui/e-tasks.c:400
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Η μέθοδος που απαιτείται για την φόρτωση του '%s' δεν υποστηρίζεται"
 
-#: calendar/gui/e-tasks.c:414 calendar/gui/gnome-cal.c:1531
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να ανοίξετε τον φάκελο στο`%s'"
 
-#: calendar/gui/e-tasks.c:482 calendar/gui/gnome-cal.c:1735
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6026,7 +6166,7 @@ msgstr "Διαγραφή επιλεγμένων αντικειμένων..."
 msgid "Expunging"
 msgstr "Εξάλειψη"
 
-#: calendar/gui/e-week-view.c:3451
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Νέο Ρ_αντεβού..."
 
@@ -6069,51 +6209,15 @@ msgstr ""
 "έχει κολλήσει. Θα πρέπει να επανεκκινήσετε το Evolution για να το "
 "χρησιμοποιήσετε ξανά"
 
-#: calendar/gui/gnome-cal.c:1993
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Άνοιγμα ημερολογίου στο %s"
 
-#: calendar/gui/gnome-cal.c:2033
+#: calendar/gui/gnome-cal.c:2035
 msgid "Opening default tasks folder"
 msgstr "Άνοιγμα φακέλου εξ ορισμού εργασιών"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Μηχανισμός ελέγχου του Bonobo για την εμφάνιση λίστας εργασιών."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Ένα παράδειγμα μηχανισμού ελέγχου για την εμφάνιση ημερολογίου."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Ημερολόγιο και Εργασίες"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Έλεγχος ρυθμίσεων για το Ημερολόγιο του Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Ρυθμίστε εδώ την Ζώνη ώρας, Ημερολόγιο και Λίστα Εργασιών σας."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Προβολή iTip/iMip ημερολογίου Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Συστατικό του Evolution για τον έλεγχο του ημερολογίου."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Εργοστάσιο για τα αντικείμενα του Ημερολογίου του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Εργοστάσιο για την συγκέντρωση του συστατικού διαλόγου του ημερολογίου"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Απρίλιος"
@@ -6170,296 +6274,173 @@ msgstr "Οκτώβριος"
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: calendar/gui/itip-utils.c:344 calendar/gui/itip-utils.c:415
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr "Πρέπει να ορίσετε έναν διοργανωτή."
 
-#: calendar/gui/itip-utils.c:379
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Απαιτείται τουλάχιστον ένας παρευρισκόμενος"
 
-#: calendar/gui/itip-utils.c:458 calendar/gui/itip-utils.c:567
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "Πληροφορίες Γεγονότος"
 
-#: calendar/gui/itip-utils.c:460 calendar/gui/itip-utils.c:569
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "Πληροφορίες Εργασιών"
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "Πληροφορίες Ημερολογίου"
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:588
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "Πληροφορία Διαθεσιμότητας"
 
-#: calendar/gui/itip-utils.c:466
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Πληροφορίες ημερολογίου"
 
-#: calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Ενημερώθηκε"
 
-#: calendar/gui/itip-utils.c:510
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Ανανέωση"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Αντιπρόταση"
 
-#: calendar/gui/itip-utils.c:582
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Πληροφορία Διαθεσιμότητας (%s έως %s)"
 
-#: calendar/gui/itip-utils.c:594
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "Πληροφορίες iCalendar"
 
-#: calendar/gui/itip-utils.c:752
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Πρέπει να είστε παρευρισκόμενος για αυτό το γεγονός."
 
-#: calendar/gui/print.c:454
-msgid "1st"
-msgstr "1η"
-
-#: calendar/gui/print.c:454
-msgid "2nd"
-msgstr "2η"
-
-#: calendar/gui/print.c:454
-msgid "3rd"
-msgstr "3η"
-
-#: calendar/gui/print.c:454
-msgid "4th"
-msgstr "4η"
-
-#: calendar/gui/print.c:454
-msgid "5th"
-msgstr "5η"
-
-#: calendar/gui/print.c:455
-msgid "6th"
-msgstr "6η"
-
-#: calendar/gui/print.c:455
-msgid "7th"
-msgstr "7η"
-
-#: calendar/gui/print.c:455
-msgid "8th"
-msgstr "8η"
-
-#: calendar/gui/print.c:455
-msgid "9th"
-msgstr "9η"
-
-#: calendar/gui/print.c:455
-msgid "10th"
-msgstr "10η"
-
-#: calendar/gui/print.c:456
-msgid "11th"
-msgstr "11η"
-
-#: calendar/gui/print.c:456
-msgid "12th"
-msgstr "12η"
-
-#: calendar/gui/print.c:456
-msgid "13th"
-msgstr "13η"
-
-#: calendar/gui/print.c:456
-msgid "14th"
-msgstr "14η"
-
-#: calendar/gui/print.c:456
-msgid "15th"
-msgstr "15η"
-
-#: calendar/gui/print.c:457
-msgid "16th"
-msgstr "16η"
-
-#: calendar/gui/print.c:457
-msgid "17th"
-msgstr "17η"
-
-#: calendar/gui/print.c:457
-msgid "18th"
-msgstr "18η"
-
-#: calendar/gui/print.c:457
-msgid "19th"
-msgstr "19η"
-
-#: calendar/gui/print.c:457
-msgid "20th"
-msgstr "20η"
-
-#: calendar/gui/print.c:458
-msgid "21st"
-msgstr "21η"
-
-#: calendar/gui/print.c:458
-msgid "22nd"
-msgstr "22η"
-
-#: calendar/gui/print.c:458
-msgid "23rd"
-msgstr "23η"
-
-#: calendar/gui/print.c:458
-msgid "24th"
-msgstr "24η"
-
-#: calendar/gui/print.c:458
-msgid "25th"
-msgstr "25η"
-
-#: calendar/gui/print.c:459
-msgid "26th"
-msgstr "26η"
-
-#: calendar/gui/print.c:459
-msgid "27th"
-msgstr "27η"
-
-#: calendar/gui/print.c:459
-msgid "28th"
-msgstr "28η"
-
-#: calendar/gui/print.c:459
-msgid "29th"
-msgstr "29η"
-
-#: calendar/gui/print.c:459
-msgid "30th"
-msgstr "30η"
-
-#: calendar/gui/print.c:460
-msgid "31st"
-msgstr "31η"
-
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "Κυ"
 
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Δε"
 
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Τρ"
 
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Τε"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Πε"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Πα"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "Σα"
 
 #. Day
-#: calendar/gui/print.c:1861
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Επιλεγμένη ημέρα (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1886 calendar/gui/print.c:1890
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1887
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1891 calendar/gui/print.c:1893
-#: calendar/gui/print.c:1894
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1898
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Επιλεγμένη εβδομάδα (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1906
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Επιλεγμένος μήνας (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1913
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Επιλεγμένο έτος (%Y)"
 
-#: calendar/gui/print.c:2247
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "Εργασία"
 
-#: calendar/gui/print.c:2304
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "_Κατάσταση: %s"
 
-#: calendar/gui/print.c:2322
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Προτεραιότητα: %s"
 
-#: calendar/gui/print.c:2336
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "%i Ολοκληρωμένο"
 
-#: calendar/gui/print.c:2348
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr "Κατηγορίες: %s"
 
-#: calendar/gui/print.c:2373
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Επαφές: "
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2612
-#: calendar/gui/tasks-control.c:591 mail/mail-callbacks.c:2908
-#: my-evolution/e-summary.c:619
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "Προεπισκόπηση Εκτύπωσης"
 
-#: calendar/gui/print.c:2549
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Εκτύπωση Στοιχείου"
 
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Ρυθμίσεις Εκτύπωσης"
 
-#: calendar/gui/tasks-control.c:148
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "Το URI του φακέλου ενεργειών προς εμφάνιση"
 
-#: calendar/gui/tasks-control.c:463
+#: calendar/gui/tasks-control.c:472
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6472,87 +6453,51 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
 
-#: calendar/gui/tasks-control.c:470
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "Να μην ξαναγίνει η ερώτηση."
 
-#: calendar/gui/tasks-control.c:622
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr "Εργασίες Εκτύπωσης"
 
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-"Το Evolution πήρε τις εργασίες που ήταν στον φάκελο του ημερολογίου και τις "
-"ενσωμάτωσε αυτόματα στο νέο φάκελο εργασιών."
-
-#: calendar/gui/tasks-migrate.c:108
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-"Το Evolution προσπάθησε να πάρει τις εργασίες που ήταν στον φάκελο του "
-"ημερολογίου και να τις ενσωμάτωσε αυτόματα στον νέο φάκελο εργασιών.\n"
-"Ορισμένες εργασίες δεν ενσωματώθηκαν, έτσι η διαδικασία αυτή μπορεί να "
-"επαναληφθεί στο μέλλον."
-
-#: calendar/gui/tasks-migrate.c:120
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-"Δεν ήταν δυνατό να ανοιχθεί το `%s' κανένα από τα στοιχεία του ημερολογίου "
-"δεν θα ενσωματωθεί στον φάκελο εργασιών"
-
-#: calendar/gui/tasks-migrate.c:133
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-"Η μέθοδος που χρειάζεται για να φορτωθεί το`%s' δεν υποστηρίζεται κανένα από "
-"τα στοιχεία του φακέλου ημερολογίου δεν θα ενσωματωθεί στον φάκελο εργασιών."
-
-#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:377
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
 msgid "SMTWTFS"
 msgstr "ΚΔΤΤΠΠΣ"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Εργοστάσιο για την εισαγωγή αρχείων iCalendar  στο Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Προβολή iTip/iMip ημερολογίου Evolution"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Εισάγει αρχεία  iCalendar στο Evolution."
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Προβολή iTip/iMip ημερολογίου Evolution"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Εισάγει αρχεία vCalendar στο Evolution."
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Προβολή iTip/iMip ημερολογίου Evolution"
 
-#: calendar/importers/icalendar-importer.c:169
-#, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr "Δεν είναι δυνατή η λήψη λίστας αποθήκης από το μητρώο: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Μήνυμα Ημερολογίου"
 
-#: calendar/importers/icalendar-importer.c:181
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Δεν είναι δυνατή η λήψη getFolderAtPath με την αποθήκη: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
+msgstr ""
 
-#: calendar/importers/icalendar-importer.c:484
+#: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
 msgstr "Υπενθύμιση!!"
 
-#: calendar/importers/icalendar-importer.c:698
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Γεγονότα Ημερολογίου"
 
-#: calendar/importers/icalendar-importer.c:723
+#: calendar/importers/icalendar-importer.c:663
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6560,10 +6505,14 @@ msgstr ""
 "Το Evolution βρήκε μηνύματα αρχεία Ημερολογίου του  Gnome \n"
 "Θέλετε να εισαχθούν στο Evolution;"
 
-#: calendar/importers/icalendar-importer.c:730
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Ημερολόγιο του Gnome"
 
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "ο χρόνος περιμένει τώρα 0 παραμέτρους"
@@ -8232,11 +8181,11 @@ msgstr "Δεν μπορεί να εισάγετε κλειδιά αυτό το c
 msgid "You may not export keys with this cipher"
 msgstr "Δεν μπορεί να εξάγετε κλειδιά αυτό το cipher"
 
-#: camel/camel-data-cache.c:137
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr "Δεν είναι δυνατή η δημιουργία διαδρομής cache"
 
-#: camel/camel-data-cache.c:375
+#: camel/camel-data-cache.c:370
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Δεν ήταν δυνατή η απομάκρυνση καταχώρησης cache: %s: %s"
@@ -8277,82 +8226,116 @@ msgid "You must be working online to complete this operation"
 msgstr ""
 "Πρέπει να είστε συνδεμένοι στο δίκτυο για να ολοκληρωθεί αυτή η διαδικασία"
 
-#: camel/camel-filter-driver.c:767 camel/camel-filter-driver.c:776
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
+#, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Δεν ήταν δυνατή η δημιουργία σωλήνωσης σε  '%s': %s"
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-process.c:92
+#, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Δεν ήταν δυνατή η  δημιουργία θυγατρικης διεργασίας  '%s': %s"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Αδυναμία ανάγνωσης χαιρετισμού από %s: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Συγχρονισμός φακέλων"
 
-#: camel/camel-filter-driver.c:865 camel/camel-filter-driver.c:1238
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Σφάλμα στην ανάλυση φίλτρου: %s: %s"
 
-#: camel/camel-filter-driver.c:874 camel/camel-filter-driver.c:1244
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Σφάλμα στην εκτέλεση φίλτρου: %s: %s"
 
-#: camel/camel-filter-driver.c:941
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Αδυναμία ανοίγματος φακέλου spool"
 
-#: camel/camel-filter-driver.c:950
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Αδυναμία ανάλυσης φακέλου spool"
 
-#: camel/camel-filter-driver.c:965
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Λήψη μηνύματος %d (%d%%)"
 
-#: camel/camel-filter-driver.c:969
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Δεν ήταν δυνατό το άνοιγμα του μηνύματος"
 
-#: camel/camel-filter-driver.c:970 camel/camel-filter-driver.c:982
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Αποτυχία στο μήνυμα %d"
 
-#: camel/camel-filter-driver.c:996 camel/camel-filter-driver.c:1090
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Συγχρονισμός φακέλου"
 
-#: camel/camel-filter-driver.c:1057
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Λήψη μηνύματος %d από %d"
 
-#: camel/camel-filter-driver.c:1072
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Αποτυχία στο μήνυμα %d από %d"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr "Αποτυχία ανάκτησης μηνύματος."
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 msgid "Invalid arguments to (system-flag)"
 msgstr "Μη έγκυρες παράμετροι σε  (system-flag)"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 msgid "Invalid arguments to (user-tag)"
 msgstr "Μη έγκυρη παράμετρος σε (user-tag)"
 
-#: camel/camel-filter-search.c:514
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Δεν ήταν δυνατή η δημιουργία σωλήνωσης σε  '%s': %s"
+msgid "Error executing filter search: %s: %s"
+msgstr "Σφάλμα στην εκτέλεση αναζήτησης φίλτρου: %s: %s"
 
-#: camel/camel-filter-search.c:550
+#: camel/camel-folder-search.c:346
 #, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Δεν ήταν δυνατή η  δημιουργία θυγατρικης διεργασίας  '%s': %s"
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Αδυναμία ανάλυσης έκφρασης αναζήτησης: %s:\n"
+"%s"
 
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-folder-search.c:356
 #, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Σφάλμα στην εκτέλεση αναζήτησης φίλτρου: %s: %s"
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Σφάλμα στην εκτέλεση έκφρασης αναζήτησης: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
+msgid "(match-all) requires a single bool result"
+msgstr "(ταίρισμα-όλων) απαιτεί ένα single bool result"
+
+#: camel/camel-folder-search.c:653
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Γίνεται επερώτηση σε άγνωστη επικεφαλίδα: %s"
 
 #: camel/camel-folder.c:583
 #, c-format
@@ -8378,33 +8361,6 @@ msgstr "Μετακίνηση μηνυμάτων"
 msgid "Copying messages"
 msgstr "Αντιγραφή μηνυμάτων"
 
-#: camel/camel-folder-search.c:343
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Αδυναμία ανάλυσης έκφρασης αναζήτησης: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:353
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Σφάλμα στην εκτέλεση έκφρασης αναζήτησης: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(ταίρισμα-όλων) απαιτεί ένα single bool result"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Γίνεται επερώτηση σε άγνωστη επικεφαλίδα: %s"
-
 #: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
@@ -8433,9 +8389,9 @@ msgstr ""
 "Χρειάζεστε μια φράση εισόδου για το ξεκλείδωμα του κλειδιού για\n"
 "χρήστη: \"%s\" "
 
-#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1246
-#: camel/camel-gpg-context.c:1353 camel/camel-gpg-context.c:1428
-#: camel/camel-gpg-context.c:1485 mail/mail-send-recv.c:565
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr "Ακυρώθηκε."
 
@@ -8458,7 +8414,7 @@ msgstr "Δεν έχουν δοθεί δεδομένα"
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Δεν ήταν δυνατή η κρυπτογράφηση: δεν έχουν οριστεί έγκυροι παραλήπτες"
 
-#: camel/camel-gpg-context.c:1122
+#: camel/camel-gpg-context.c:1125
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8469,51 +8425,30 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1131
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Αποτυχία GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1237 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1580
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Αποτυχία εκτέλεσης gpg: %s"
 
-#: camel/camel-gpg-context.c:1267 camel/camel-gpg-context.c:1345
-#: camel/camel-gpg-context.c:1419 camel/camel-gpg-context.c:1449
-#: camel/camel-gpg-context.c:1476 camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
 msgid "Failed to execute gpg."
 msgstr "Αποτυχία εκτέλεσης gpg"
 
-#: camel/camel-gpg-context.c:1330
+#: camel/camel-gpg-context.c:1333
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: δεν ήταν δυνατή η "
 "δημιουργία προσωρινού αρχείου: %s"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Δεν ήταν δυνατή η δημιουργία αρχείου κλειδώματος για %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Εκτός χρόνου για την λήψη αρχείου κλειδώματος στο %s. Προσπαθήστε αργότερα."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Αποτυχία κλειδώματος με χρήση fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Αποτυχία κλειδώματος με χρήση flock(2): %s"
-
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8535,6 +8470,27 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr "Δεν ήταν δυνατό το κλείδωμα του %s"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Δεν ήταν δυνατή η δημιουργία αρχείου κλειδώματος για %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+"Εκτός χρόνου για την λήψη αρχείου κλειδώματος στο %s. Προσπαθήστε αργότερα."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Αποτυχία κλειδώματος με χρήση fcntl(2): %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Αποτυχία κλειδώματος με χρήση flock(2): %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8601,11 +8557,11 @@ msgstr "Αποτυχία αποκρυπτογράφησης τμήματος MIM
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Αποτυχία αποκρυπτογράφησης τμήματος MIME: σφάλμα ανάλυσης"
 
-#: camel/camel-multipart-signed.c:625
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr "Αυτό το σημείο του μηνύματος είναι ψηφιακά υπογεγραμμένο"
 
-#: camel/camel-multipart-signed.c:679
+#: camel/camel-multipart-signed.c:682
 msgid "parse error"
 msgstr "σφάλμα ανάλυσης"
 
@@ -8679,11 +8635,11 @@ msgstr ""
 "Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με ασφαλή CRAM-MD5 κωδικό, "
 "αν το υποστηρίζει ο διακομιστής."
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8691,43 +8647,121 @@ msgstr ""
 "Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με ασφαλή DIGEST-MD5 κωδικό, "
 "αν το υποστηρίζει ο διακομιστής."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Πολύ μακρύ challenge διακομιστή (>2048 octets)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Μη έγκυρο challenge διακομιστή\n"
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 "Το challenge διακομιστή περιέχει μη έγκυρο κουπόνι \"Ποιότητας Προστασίας\"\n"
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr "Στην απάντηση του διακομιστή δεν υπάρχουν δεδομένα εξουσιοδότησης\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 "Στην απάντηση του διακομιστή δεν υπάρχουν όλα τα δεδομένα εξουσιοδότησης\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "Η απάντηση του διακομιστή δεν ταιριάζει\n"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-gssapi.c:48
+msgid "GSSAPI"
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:50
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr ""
+"Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με την πιστοποίηση Kerberos "
+"4."
+
+#: camel/camel-sasl-gssapi.c:148
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:153
+msgid "The provided target_name parameter was ill-formed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:156
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:160
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:165
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:169
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:180
+msgid "The consistency checks performed on the credential failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:183
+msgid "The referenced credentials have expired."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
+msgid "Bad authentication response from server."
+msgstr "Εσφαλμένη απάντηση πιστοποίησης από τον διακομιστή"
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Δεν ήταν δυνατή η δημιουργία σωλήνωσης σε  '%s': %s"
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Ο τύπος δεν υποστηρίζεται"
+
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με την πιστοποίηση Kerberos "
 "4."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8736,11 +8770,6 @@ msgstr ""
 "Δεν ήταν δυνατή η λήψη του εισιτηρίου Kerberos:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1049
-msgid "Bad authentication response from server."
-msgstr "Εσφαλμένη απάντηση πιστοποίησης από τον διακομιστή"
-
 #: camel/camel-sasl-login.c:32
 msgid "Login"
 msgstr "Είσοδος"
@@ -8792,7 +8821,7 @@ msgstr "ΡΟΡ πριν από SMTP εξουσιοδότηση με άγνωστ
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "ΡΟΡ Πριν από SMTP εξουσιοδότηση με χρήση μη-pop πηγής"
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Αποτυχία σύνταξης κανονικής έκφρασης: %s: %s"
@@ -8817,30 +8846,30 @@ msgstr "Η ηλεκτρονική διεύθυνση '%s' χρειάζεται �
 msgid "Resolving: %s"
 msgstr "Ανάλυση: %s"
 
-#: camel/camel-service.c:773 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Αποτυχία στην αναζήτηση ονόματος: %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Αποτυχία συσχέτισης εξυπηρετητή: %s: εξυπηρετητής δεν βρέθηκε"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Αποτυχία συσχέτισης εξυπηρετητή: %s: άγνωστος λόγος"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 msgid "Resolving address"
 msgstr "Ανάλυση διεύθυνσης"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr "Αποτυχία συσχέτισης εξυπηρετητή: εξυπηρετητής δεν βρέθηκε"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr "Αποτυχία συσχέτισης εξυπηρετητή: άγνωστος λόγος"
 
@@ -8913,123 +8942,123 @@ msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Δεν είναι δυνατό να δημιουργηθεί ο φακέλος: Μη έγκυρη σε αυτή την αποθήκη"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr "Αποτυχία κατά την λήψη πιστοποιητικού εκδότη"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr "Αδυναμία λήψης Λίστας Ανάκτησης Πιστοποιητικών"
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr "Αδυναμία αποκρυπτογράφησης υπογραφής πιστοποιητικού"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "Αδυναμία αποκρυπτογράφησης υπογραφής Λίστας Ανάκτησης Πιστοποιητικών"
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr "Αδυναμία αποκωδικοποίησης δημοσίου κλειδιού εκδότη"
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr "Αποτυχία υπογραφής πιστοποιητικού"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr "Αποτυχία υπογραφής  Λίστας Ανάκτησης Πιστοποιητικών"
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr "Το πιστοποιητικό δεν είναι ακόμα έγκυρο"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Το πιστοποιητικό έχει λήξει"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr "Η CRL δεν είναι ακόμα έγκυρη"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr "Η CRL έχει λήξει"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr "Σφάλμα στο  CRL"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Ανεπάρκεια μνήμης"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr "Αυτο-υπογεγραμμένο , μηδενικού βάθους πιστοποιητικό "
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr "Αυτο-υπογεγραμμένο πιστοποιητικό στην αλυσίδα"
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr "Αδυναμία λήψης πιστοποιητικού εκδότη τοπικά"
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr "Αδυναμία επαλήθευσης υπογραφής leaf"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr "Αλυσίδα πιστοποιητικού πολύ μακριά"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr "Το πιστοποιητικό ανακλήθηκε"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Μή έγκυρη Αρχή Πιστοποίησης (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr "Υπέρβαση μήκους διαδρομής"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr "Μη έγκυρος σκοπός"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr "Μη έμπιστο πιστοποιητικό"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr "Απόρριψη πιστοποιητικού"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr "Αναντιστοιχία Εκδότη/Θέματος"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr "Αναντιστοιχία AKID/SKID"
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr "Αναντιστοιχία  σειριακού AKID/εκδότη"
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr "Η χρήση κλειδιού δεν υποστηρίζει υπογραφή πιστοποιητικού"
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr "Σφάλμα στην επαλήθευση εφαρμογής"
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:806
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9042,15 +9071,15 @@ msgstr ""
 "Αποτύπωμα:       %s\n"
 "Υπογραφή:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:812
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "ΚΑΛΟ"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:812
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "ΚΑΚΟ"
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9070,7 +9099,7 @@ msgstr ""
 "Θέλετε να το δεχτείτε ούτως ή άλλως;"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:816
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9085,7 +9114,7 @@ msgstr ""
 "\n"
 "Θέλετε να το αποδεχθείτε;"
 
-#: camel/camel-tcp-stream-ssl.c:860
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9094,7 +9123,7 @@ msgstr ""
 "Πρόβλημα Πιστοποιητικού: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-tcp-stream-ssl.c:912
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9103,7 +9132,7 @@ msgstr ""
 "Εσφαλμένος τομέας πιστοποιητικού: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-tcp-stream-ssl.c:930
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9112,7 +9141,7 @@ msgstr ""
 "Το πιστοποιητικό έχει λήξει: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9121,7 +9150,7 @@ msgstr ""
 "Η λίστα ανάκτησης πιστοποιητικών έχει λήξει: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Αδυναμία ανάλυσης URL `%s'"
@@ -9136,26 +9165,26 @@ msgstr "Σφάλμα αποθήκευσης `%s': %s"
 msgid "No such message %s in %s"
 msgstr "Κανένα τέτοιο μήνυμα %s στο %s"
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Αδυναμία αντιγραφής ή μετακίνησης μηνυμάτων σε ένα εικονικό φάκελο"
 
-#: camel/camel-vee-store.c:272
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου %s: Άκυρη λειτουργία"
 
-#: camel/camel-vee-store.c:291
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου %s: Δεν υπάρχει ο φάκελος"
 
-#: camel/camel-vee-store.c:304
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Άκυρη λειτουργία"
 
-#: camel/camel-vee-store.c:312
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9163,13 +9192,13 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:452
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "Η λειτουργία ακυρώθηκε"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Απροσδόκητη αποσύνδεση του διακομιστή: %s"
@@ -9194,16 +9223,16 @@ msgstr "Απροσδόκητη απάντηση από τον διακομιστ
 msgid "IMAP command failed: %s"
 msgstr "Η εντολή IMAP απέτυχε: %s"
 
-#: camel/providers/imap/camel-imap-command.c:462
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "Η ανταπόκριση από τον διακομιστή τερματίστηκε πιο νωρίς."
 
-#: camel/providers/imap/camel-imap-command.c:654
+#: camel/providers/imap/camel-imap-command.c:655
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Η απάντηση του διακομιστή ΙΜΑΡ δεν περιείχε την πληροφορία %s"
 
-#: camel/providers/imap/camel-imap-command.c:690
+#: camel/providers/imap/camel-imap-command.c:691
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Απροσδόκητη απάντηση ΟΚ από τον διακομιστή IMAP: %s"
@@ -9295,7 +9324,7 @@ msgstr "Έλεγχος για νέα μηνύματα"
 msgid "Check for new messages in all folders"
 msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1134
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "Φάκελοι"
 
@@ -9326,7 +9355,7 @@ msgstr "Για ανάγνωση και αποθήκευση μηνυμάτων �
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:83
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Κωδικός Πρόσβασης"
 
@@ -9346,60 +9375,59 @@ msgstr "Διακομιστής IMAP %s"
 msgid "IMAP service for %s on %s"
 msgstr "Υπηρεσία IMAP για %s στο %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr "Η σύνδεση ακυρώθηκε"
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Δεν ήταν δυνατή η σύνδεση στο %s (θύρα %d) : %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP σε ασφαλή λειτουργία: %s"
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 msgid "SSL/TLS extension not supported."
 msgstr "Η επέκταση SSL/TLS  δεν υποστηρίζεται"
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 msgid "SSL negotiations failed"
 msgstr "Αποτυχία διαπραγματεύσεων SSL"
 
-#: camel/providers/imap/camel-imap-store.c:1072
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Ο διακομιστής IMAP %s δεν υποστηρίζει την αιτούμενο τύπο πιστοποίησης %s"
 
-#: camel/providers/imap/camel-imap-store.c:1082
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Μη υποστηριζόμενος τύπος πιστοποίησης %s"
 
-#: camel/providers/imap/camel-imap-store.c:1106
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sΠαρακαλώ εισάγετε τον κωδικό IMAP για %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1121
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Δεν έχετε εισάγει κωδικό πρόσβασης."
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9410,13 +9438,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1495
-#: camel/providers/imap/camel-imap-store.c:1637
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr "Δεν υπάρχει τέτοιος φάκελος %s"
 
-#: camel/providers/imap/camel-imap-store.c:1838
+#: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
@@ -9424,12 +9452,12 @@ msgstr ""
 "Το όνομα φακέλου \"%s\" δεν είναι έγκυρο δεν μπορεί να περιέχει τον "
 "χαρακτήρα \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1850
+#: camel/providers/imap/camel-imap-store.c:1851
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Άγνωστος μητρικός φάκελος: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1886
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ο μητρικός φάκελος δεν επιτρέπεται να περιέχει υποφάκελους"
 
@@ -9508,7 +9536,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Η αποθήκη του root %s δεν είναι απόλυτη θέση"
@@ -9534,7 +9562,7 @@ msgstr "Οι τοπικές αποθήκες δεν έχουν εισερχόμ�
 msgid "Local mail file %s"
 msgstr "Τοπικό αρχείο μηνυμάτων %s"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:904
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s στο %s: %s"
@@ -9580,7 +9608,7 @@ msgstr "Μη έγκυρα περιεχόμενα στο μήνυμα"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9592,14 +9620,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Ο φάκελος `%s' δεν υπάρχει."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:169
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9625,8 +9653,8 @@ msgid "not a maildir directory"
 msgstr "δεν είναι κατάλογος maildir"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:283
-#: camel/providers/local/camel-spool-store.c:313
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Δεν ήταν δυνατή η σάρωση του φακέλου `%s': %s"
@@ -9646,10 +9674,10 @@ msgid "Checking for new messages"
 msgstr "Έλεγχος για νέα μηνύματα"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:679
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Φάκελος αποθήκευσης"
 
@@ -9731,76 +9759,76 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ο φάκελος `%s' δεν είναι άδειος. Δεν έγινε η διαγραφή."
 
-#: camel/providers/local/camel-mbox-summary.c:351
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Δεν ήταν δυνατό το άνοιγμα του φακέλου: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:399
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Μοιραίο σφάλμα ανάλυσης αλληλογραφίας κοντά στην τοποθεσία %ld στον φάκελο %s"
 
-#: camel/providers/local/camel-mbox-summary.c:455
+#: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Δεν είναι δυνατό να ελεγχθεί ο φάκελος: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:593
-#: camel/providers/local/camel-mbox-summary.c:684
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Δεν είναι δυνατό το άνοιγμα του αρχείου: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:605
-#: camel/providers/local/camel-spool-summary.c:170
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Δεν είναι δυνατό το άνοιγμα του προσωρινού mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:618
-#: camel/providers/local/camel-mbox-summary.c:780
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Δεν ήταν δυνατό το κλείσιμο του φακέλου πηγής %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:627
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Δεν ήταν δυνατό το κλείσιμο του προσωρινού φακέλου:%s"
 
-#: camel/providers/local/camel-mbox-summary.c:638
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:722
-#: camel/providers/local/camel-mbox-summary.c:730
-#: camel/providers/local/camel-mbox-summary.c:921
-#: camel/providers/local/camel-mbox-summary.c:929
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Ασυμφωνία περίληψης και φακέλου, ακόμα και μετά από συγχρονισμό"
 
-#: camel/providers/local/camel-mbox-summary.c:855
-#: camel/providers/local/camel-spool-summary.c:342
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Άγνωστο σφάλμα: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:890
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Αδυναμία αποθήκευσης φακέλου : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:984
-#: camel/providers/local/camel-mbox-summary.c:1010
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Σφάλμα κατά την εγγραφή του προσωρινού mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Η εγγραφή του προσωρινού mailbox απέτυχε: %s: %s"
@@ -9824,63 +9852,63 @@ msgstr "`%s' δεν είναι κατάλογος"
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Δεν είναι δυνατό να βρεθεί η θέση καταλόγου του ΜΗ: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Το Spool `%s' δεν μπορεί να ανοιχθεί: %s"
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Spool `%s'  δεν είναι κανονικός κατάλογος ή αρχείο"
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Ο φάκελος`%s/%s' δεν υπάρχει."
 
-#: camel/providers/local/camel-spool-store.c:177
+#: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' δεν είναι αρχείο αλληλογραφίας."
 
-#: camel/providers/local/camel-spool-store.c:194
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr " Η αποθήκευση δεν υποστηρίζει ένα INBOX"
 
-#: camel/providers/local/camel-spool-store.c:206
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Αρχειο αλληλογραφίας spool %s"
 
-#: camel/providers/local/camel-spool-store.c:206
+#: camel/providers/local/camel-spool-store.c:209
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Δέντρο φακέλου spool "
 
-#: camel/providers/local/camel-spool-store.c:214
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Οι φάκελοι spool δεν μπορούν να μετονομασθούν"
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Οι φάκελοι spool δεν μπορούν να διαγραφούν"
 
-#: camel/providers/local/camel-spool-summary.c:183
-#: camel/providers/local/camel-spool-summary.c:193
-#: camel/providers/local/camel-spool-summary.c:203
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Δεν ήταν δυνατό να συγχρονιστεί ο προσωρινός φάκελός %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:219
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Αδυναμία συγχρονισμού φακέλου spool %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:250
-#: camel/providers/local/camel-spool-summary.c:269
-#: camel/providers/local/camel-spool-summary.c:282
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -10014,7 +10042,7 @@ msgstr "Αντίγραφο στον διακομιστή"
 msgid "Delete after %s day(s)"
 msgstr "Διαγραφή μετά από %s ημέρα(ες)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -10041,26 +10069,26 @@ msgstr ""
 "κρυπτογραφημένου κωδικού πρόσβασης. Αυτό μπορεί να μην λειτουργεί για όλους "
 "του χρήστες, ακόμα και αν οι διακομιστές υποστηρίζουν το αντίθετο."
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Δεν ήταν δυνατή η σύνδεση στον διακομιστή  POP %s (θύρα %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s σε ασφαλή λειτουργία: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s "
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10069,28 +10097,28 @@ msgstr ""
 "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s .\n"
 "Δεν υποστηρίζεται ο μηχανισμός πιστοποίησης."
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' Είσοδος απέτυχε για τον διακομιστή POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Αδυναμία εισόδου στον διακομιστή POP %s: Σφάλμα πρωτοκόλου SASL "
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Δεν είναι δυνατή η πιστοποίηση στον διακομιστή POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sΠαρακαλώ εισάγετε τον κωδικό πρόσβασης POP για %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:523
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10099,13 +10127,13 @@ msgstr ""
 "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s.\n"
 "Σφάλμα κατά την αποστολή κωδικού πρόσβασης %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:615
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Δεν υπάρχει ο φάκελος `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10117,52 +10145,52 @@ msgstr ""
 "Για την παράδοση μηνυμάτων με την προώθηση στο πρόγραμμα \"sendmail\" στο "
 "τοπικό σύστημα."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Αδυναμία ανάλυσης λίστας παραληπτών"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Δεν ήταν δυνατή η δημιουργία σωλήνωσης προς το sendmail: %s: το μήνυμα δεν "
 "στάλθηκε"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Δεν ήταν δυνατή η δικράνωση του sendmail: %s: το μήνυμα δεν στάλθηκε"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Δεν είναι δυνατή η αποστολή του μηνύματος : %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "το πρόγραμμα sendmail τερματίστηκε με σήμα %s: το μήνυμα δεν στάλθηκε."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Δεν είναι δυνατό να εκτελεστεί το %s: το μήνυμα δεν στάλθηκε."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 "το πρόγραμμα sendmail τερματίστηκε σε κατάσταση %d: το μήνυμα δεν στάλθηκε."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr "Παράδοση μηνυμάτων μέσω του προγράμματος sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:99
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10172,142 +10200,142 @@ msgstr ""
 "Για τη παράδοση μηνυμάτων με την σύνδεση σε απομακρυσμένο mailhub με χρήση "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "Σφάλμα σύνταξης, δεν αναγνωρίζεται η εντολή"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Σφάλμα σύνταξης σε παραμέτρους"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Η εντολή δεν έχει ενσωματωθεί"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Η παράμετρος της εντολής δεν έχει ενσωματωθεί"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Κατάσταση συστήματος, ή το σύστημα βοήθειας έτοιμο"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Μήνυμα βοήθειας"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Η υπηρεσία είναι έτοιμη"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Η υπηρεσία κλείνει το κανάλι μετάδοσης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Η υπηρεσία δεν υπάρχει τερματίζεται το κανάλι μετάδοσης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Εντάξει η αιτηθείσα ενέργεια ταχυδρομείου, ολοκληρώθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr "Όχι τοπικός χρήστης , θα γίνει προώθηση στο <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "Η αιτηθείσα ενέργεια ταχυδρομείου δεν εκτελέστηκε: το mailbox δεν είναι "
 "διαθέσιμο"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Η αιτηθείσα ενέργεια δεν εκτελέστηκε: το mailbox δεν είναι διαθέσιμο"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Η αιτηθείσα ενέργεια εγκαταλείφθηκε: σφάλμα κατά την επεξεργασία"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr "Όχι τοπικός χρήστης, παρακαλώ δοκιμάστε <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Η αιτηθείσα ενέργεια δεν εκτελέστηκε: ανεπαρκή αποθήκη συστήματος"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "Η αιτηθείσα ενέργεια εγκαταλείφθηκε: υπέρβαση του κατανεμημένου χώρου "
 "αποθήκευσης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "Η αιτηθείσα ενέργεια δεν εκτελέστηκε: το όνομα του mailbox δεν επιτρέπεται"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Εκκίνηση εισαγωγής μηνυμάτων; τελειώνει με <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "Η διεξαγωγή απέτυχε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "Απαιτείται η ανταλλαγή κωδικού πρόσβασης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Ο μηχανισμός πιστοποίησης είναι αδύναμος"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Απαιτείται Κρυπτογράφηση για τον μηχανισμό πιστοποίησης που ζητήθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Προσωρινή αποτυχία πιστοποίησης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Απαιτείται πιστοποίηση"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr "Σφάλμα απάντησης Welcome"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή SMTP %s  σε ασφαλή λειτουργία: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:342
 msgid "server does not appear to support SSL"
 msgstr "ο διακομιστής δεν φαίνεται να υποστηρίζει SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Αίτηση  STARTTLS εκτός χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr "Σφάλμα απάντησης STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "Ο διακομιστής SMTP %s δεν υποστηρίζει τον τύπο πιστοποίησης %s που ζητήθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sΠαρακαλώ εισάγετε τον κωδικό πρόσβασης SMTP για %s@%s"
@@ -10354,61 +10382,61 @@ msgstr ""
 "Δεν είναι δυνατή η αποστολή του μηνύματος: ένας ή περισσότεροι μη έγκυροι "
 "παραλήπτες"
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "Χαιρετισμός SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Αίτηση HELO εκτός χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "HELO response error"
 msgstr "Σφάλμα απάντησης HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "Πιστοποίηση SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Σφάλμα κατά την δημιουργία του αντικειμένου πιστοποίησης SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Αίτηση Πιστοποίησης εκτός χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "Η αίτηση Πιστοποίησης απέτυχε."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Εσφαλμένη απάντηση πιστοποίησης από τον διακομιστής.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Αίτηση MAIL FROM εκτός χρόνου: %s: το μήνυμα δεν στάλθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr "Σφάλμα απάντησης MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Αίτηση RCPT TO εκτός χρόνου: %s:το μήνυμα δεν στάλθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> απέτυχε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Αίτηση DATA εκτός χρόνου: %s:το μήνυμα δεν στάλθηκε"
@@ -10416,37 +10444,37 @@ msgstr "Αίτηση DATA εκτός χρόνου: %s:το μήνυμα δεν �
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 msgid "DATA response error"
 msgstr "Σφάλμα απάντησης DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Εκτός χρόνου η αποστολή DATA: τερματισμός μηνύματος:  %s: το μήνυμα δεν "
 "στάλθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr "Εσφαλμένη απάντηση τερματισμού DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Αίτηση RSET εκτός χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr "Σφάλμα απάντησης RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Αίτηση QUIT έκτος χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr "Σφάλμα απάντησης QUIT"
 
@@ -10466,29 +10494,29 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:364 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "συννημένο"
 
-#: composer/e-msg-composer-attachment-bar.c:505
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr "Αφαίρεση επιλεγμένων αντικειμένων από τον κατάλογο συννημένων"
 
-#: composer/e-msg-composer-attachment-bar.c:535
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Προσθήκη συννημένου..."
 
-#: composer/e-msg-composer-attachment-bar.c:536
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Επισύναψη αρχείου στο μήνυμα"
 
-#: composer/e-msg-composer-attachment.c:165
-#: composer/e-msg-composer-attachment.c:181
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Δεν είναι δυνατή η επισύναψη του αρχείου %s: %s"
 
-#: composer/e-msg-composer-attachment.c:173
+#: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Δεν είναι δυνατή η επισύναψη του αρχείου %s: δεν είναι κανονικό αρχείο"
@@ -10506,15 +10534,92 @@ msgid "MIME type:"
 msgstr "Τύπος MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:67
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr "Πρόταση για αυτόματη προβολή της επισύναψης"
 
-#: composer/e-msg-composer.c:523
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:479
+msgid "Click here for the address book"
+msgstr "Κλικ εδώ για το βιβλίου διευθύνσεων"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:510
+msgid "Reply-To:"
+msgstr "Απάντηση Σε:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:516
+msgid "From:"
+msgstr "Από:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:522
+msgid "Subject:"
+msgstr "Θέμα:"
+
+#: composer/e-msg-composer-hdrs.c:531
+msgid "To:"
+msgstr "Προς:"
+
+#: composer/e-msg-composer-hdrs.c:532
+msgid "Enter the recipients of the message"
+msgstr "Εισάγετε τους παραλήπτες του μηνύματος"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "Cc:"
+msgstr "Κοινοποίηση:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Bcc:"
+msgstr "Κρυφή κοινοποίηση:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος χωρίς αυτές "
+"να εμφανιστούν στον κατάλογο παραληπτών του μηνύματος."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:547
+msgid "Post To:"
+msgstr "Αποστολή σε:"
+
+#: composer/e-msg-composer-hdrs.c:549
+msgid "Posting destination"
+msgstr "Προορισμός αποστολής"
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Επισύναψη αρχείου"
+
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων υπογραφής PGP"
 
-#: composer/e-msg-composer.c:802
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10523,30 +10628,30 @@ msgstr ""
 "Σφάλμα κατά την ανάγνωση του αρχείου %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1183
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Το αρχείο υπάρχει, να γίνει επικάλυψη;"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Σφάλμα κατά την αποθήκευση του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1224
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Σφάλμα κατά το φόρτωμα του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1259
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Σφάλμα κατά την προσπέλαση του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Αδύνατη η ανάκτηση του μηνύματος από τον επεξεργαστή"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10555,7 +10660,7 @@ msgstr ""
 "Αδύνατη η αναζήτηση στο αρχείο: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10564,7 +10669,7 @@ msgstr ""
 "Αδυναμία  truncate αρχείου: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1285
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10573,7 +10678,7 @@ msgstr ""
 "Αδυναμία αντιγραφής περιγραφέα αρχείου: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1299
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10582,7 +10687,7 @@ msgstr ""
 "Σφάλμα κατά την αυτόματη αποθήκευση του μηνύματος: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10591,7 +10696,7 @@ msgstr ""
 "προηγούμενη συνεδρία.\n"
 "Θέλετε να γίνει προσπάθεια ανάκτηση τους;"
 
-#: composer/e-msg-composer.c:1556
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10602,31 +10707,32 @@ msgstr ""
 "\n"
 "Θέλετε να αποθηκεύσετε τις αλλαγές;"
 
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "Α_πόρριψη αλλαγών"
 
-#: composer/e-msg-composer.c:1565
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Προειδοποίηση: Τροποποιημένο Μήνυμα"
 
-#: composer/e-msg-composer.c:1597
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Άνοιγμα αρχείου"
 
-#: composer/e-msg-composer.c:1955
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "Υπογραφή"
 
-#: composer/e-msg-composer.c:1995 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr "Αυτόματη δημιουργία"
 
-#: composer/e-msg-composer.c:2179 composer/e-msg-composer.c:2794
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: composer/e-msg-composer.c:2825
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10634,7 +10740,7 @@ msgstr ""
 "Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
 "Αδύνατη η ενεργοποίηση του συστατικού ελέγχου του επιλογέα διευθύνσεων."
 
-#: composer/e-msg-composer.c:2851
+#: composer/e-msg-composer.c:2931
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10646,7 +10752,7 @@ msgstr ""
 "Βεβαιωθείτε ότι έχετε εγκατεστημένη την σωστή έκδοση\n"
 "gtkhtml και libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:2911
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10654,7 +10760,7 @@ msgstr ""
 "Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
 "Αδύνατη η ενεργοποίηση του συστατικού του επεξεργαστή HTML."
 
-#: composer/e-msg-composer.c:3899
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10662,91 +10768,6 @@ msgstr ""
 "<b>(Ο επεξεργαστής περιέχει ένα σώμα μηνύματος που δεν είναι κείμενο, στο "
 "οποίο δεν είναι δυνατή η επεξεργασία.)<b>"
 
-#: composer/e-msg-composer-hdrs.c:375
-msgid "Click here for the address book"
-msgstr "Κλικ εδώ για το βιβλίου διευθύνσεων"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:407
-msgid "Reply-To:"
-msgstr "Απάντηση Σε:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:418
-msgid "From:"
-msgstr "Από:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:424
-msgid "Subject:"
-msgstr "Θέμα:"
-
-#: composer/e-msg-composer-hdrs.c:438
-msgid "To:"
-msgstr "Προς:"
-
-#: composer/e-msg-composer-hdrs.c:439
-msgid "Enter the recipients of the message"
-msgstr "Εισάγετε τους παραλήπτες του μηνύματος"
-
-#: composer/e-msg-composer-hdrs.c:442
-msgid "Cc:"
-msgstr "Κοινοποίηση:"
-
-#: composer/e-msg-composer-hdrs.c:443
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος"
-
-#: composer/e-msg-composer-hdrs.c:446
-msgid "Bcc:"
-msgstr "Κρυφή κοινοποίηση:"
-
-#: composer/e-msg-composer-hdrs.c:447
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος χωρίς αυτές "
-"να εμφανιστούν στον κατάλογο παραληπτών του μηνύματος."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:454
-msgid "Post To:"
-msgstr "Αποστολή σε:"
-
-#: composer/e-msg-composer-hdrs.c:456
-msgid "Posting destination"
-msgstr "Προορισμός αποστολής"
-
-#: composer/e-msg-composer-select-file.c:103
-#: composer/e-msg-composer-select-file.c:120
-msgid "Attach file(s)"
-msgstr "Επισύναψη αρχείου"
-
-#: composer/evolution-composer.c:417
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"Δεν ήταν δυνατή η ενεργοποίηση του παραθύρου του επεξεργαστή επειδή\n"
-"δεν έχετε ρυθμίσει καμία ταυτότητα στο συστατικό ταχυδρομείου."
-
-#: composer/evolution-composer.c:432
-msgid "Cannot initialize the Evolution composer."
-msgstr "Δεν είναι δυνατή η ενεργοποίηση του επεξεργαστή του Evolution"
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Η σουίτα εφαρμογών Evolution "
@@ -10795,6 +10816,105 @@ msgstr "Θέμα περιέχει"
 msgid "Subject does not contain"
 msgstr "Θέμα δεν περιέχει"
 
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:4
+#, fuzzy
+msgid "<b>Out of Office Message:</b>"
+msgstr "Εκτός Γραφείου"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Ξεκινάει:</b> "
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:12
+#, fuzzy
+msgid "Out of Office Assistant"
+msgstr "Εκτός Γραφείου"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "Κατάσταση Σημαίας"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "Γίνεται Λήψη Μηνύματος"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "Αποστέλλονται τα μηνύματα"
+
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:9
+#, fuzzy
+msgid "Read Receipts"
+msgstr "Παραλήπτες"
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
 #: e-util/e-component-listener.c:128
 msgid ""
 "ping_timeout_callback: could not determine if the CORBA object is nil or not"
@@ -10802,7 +10922,7 @@ msgstr ""
 "ping_timeout_callback: αδυναμία εντοπισμού αν το αντικείμενο CORBA είναι "
 "μηδενικό ή όχι"
 
-#: e-util/e-dialog-utils.c:230
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10810,20 +10930,24 @@ msgstr ""
 "Υπάρχει  ήδη αρχείο με αυτό το όνομα\n"
 "Να γίνει επικάλυψη;"
 
-#: e-util/e-passwords.c:344
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Επικάλυψη αρχείου;"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Απομνημόνευση του κωδικού πρόσβασης"
 
-#: e-util/e-passwords.c:346
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 "Απομνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr "Συγχρονισμός Ιδιωτικών Αρχείων:"
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 msgid "Sync Categories:"
 msgstr "Κατηγορίες συγχρονισμού:"
 
@@ -10898,13 +11022,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1630
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1627
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10913,42 +11037,74 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:65 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:178
-msgid "seconds"
-msgstr "δευτερόλεπτα"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 δευτερόλεπτο"
+
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d δευτερόλεπτα"
+
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 λεπτό"
 
 #: filter/filter-datespec.c:66
-msgid "minute"
-msgstr "λεπτό"
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d λεπτά"
 
 #: filter/filter-datespec.c:67
-msgid "hour"
-msgstr "ώρα"
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 ώρα"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d ώρες"
+
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 ημέρα"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr "%d %s πριν"
 
 #: filter/filter-datespec.c:69
-msgid "week"
-msgstr "εβδομάδα"
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 εβδομάδα"
 
-#: filter/filter-datespec.c:69 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "εβδομάδες"
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d εβδομάδες"
 
 #: filter/filter-datespec.c:70
-msgid "month"
+#, fuzzy
+msgid "1 month ago"
 msgstr "μήνας"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:23
-msgid "months"
-msgstr "μήνες"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr "%d %s πριν"
 
 #: filter/filter-datespec.c:71
-msgid "year"
-msgstr "χρόνος"
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:71 filter/filter.glade.h:33
-msgid "years"
-msgstr "χρόνια"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr "%d %s πριν"
 
 #: filter/filter-datespec.c:176
 msgid "You must choose a date."
@@ -10967,17 +11123,11 @@ msgstr "τώρα"
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:298 filter/filter-datespec.c:301
-#, c-format
-msgid "%d %s ago"
-msgstr "%d %s πριν"
-
-#: filter/filter-datespec.c:417
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Επιλέξτε μια ώρα για να συγκρίνετε"
 
-#: filter/filter-editor.c:115 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Κανόνες Φίλτρων"
 
@@ -10990,7 +11140,7 @@ msgstr "Πρέπει να επιλέξετε ένα όνομα αρχείου."
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Το αρχείο '%s'  δεν υπάρχει ή δεν είναι κανονικό αρχείο."
 
-#: filter/filter-file.c:293
+#: filter/filter-file.c:298
 msgid "Choose a file"
 msgstr "Επιλογή ενός αρχείου"
 
@@ -10999,15 +11149,93 @@ msgstr "Επιλογή ενός αρχείου"
 msgid "Then"
 msgstr "Τότε"
 
-#: filter/filter-folder.c:153
+#: filter/filter-folder.c:155
 msgid "You must specify a folder."
 msgstr "Πρέπει να καθορίσετε ένα κατάλογο."
 
-#: filter/filter-folder.c:241 filter/vfolder-rule.c:406
-#: mail/mail-account-gui.c:1475 mail/mail-account-gui.c:1489
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "Επιλογή Φακέλου"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Σφάλμα στην κανονική έκφραση '%s':\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
+msgid "Important"
+msgstr "Σημαντικό"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
+msgid "Work"
+msgstr "Εργασία"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1281
+msgid "Personal"
+msgstr "Προσωπικό"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
+msgid "To Do"
+msgstr "Πρός Τακτοποίηση"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1283
+msgid "Later"
+msgstr "Αργότερα"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Δοκιμή"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Πρέπει να δώσετε όνομα σ' αυτό το φίλτρο."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "'Όνομα κανόνα: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Χωρίς τίτλο"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Αν"
+
+#: filter/filter-rule.c:790
+msgid "Execute actions"
+msgstr "Εκτέλεση ενεργειών"
+
+#: filter/filter-rule.c:794
+msgid "if all criteria are met"
+msgstr "αν ικανοποιηθούν όλα τα κριτήρια"
+
+#: filter/filter-rule.c:799
+msgid "if any criteria are met"
+msgstr "αν ικανοποιηθούν κάποια από τα κριτήρια"
+
+#: filter/filter-rule.c:894
+msgid "incoming"
+msgstr "εισερχόμενα"
+
+#: filter/filter-rule.c:894
+msgid "outgoing"
+msgstr "εξερχόμενα"
+
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Σύγκριση με"
@@ -11052,7 +11280,7 @@ msgstr ""
 "Η ημερομηνία του μηνύματος θα συγκριθεί με\n"
 "την τρέχουσα ώρα  όταν λειτουργεί το φίλτρο."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:115
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Εικονικοί Φάκελοι"
 
@@ -11064,6 +11292,14 @@ msgstr "η ώρα σχετική με την τρέχουσα ώρα"
 msgid "ago"
 msgstr "πριν"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "μήνες"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "δευτερόλεπτα"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "για τον συγκεκριμένους φακέλους"
@@ -11080,6 +11316,10 @@ msgstr "ή ώρα που ορίζετε"
 msgid "vFolder Sources"
 msgstr "Πηγές εΦακέλων"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "εβδομάδες"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "με όλους τους ενεργούς απομακρυσμένους φακέλους"
@@ -11092,81 +11332,9 @@ msgstr "με όλους τους τοπικούς και ενεργούς απο
 msgid "with all local folders"
 msgstr "με όλους τους τοπικούς φακέλους"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Σφάλμα στην κανονική έκφραση '%s':\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:68
-#: mail/mail-config.glade.h:61
-msgid "Important"
-msgstr "Σημαντικό"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:69
-#: mail/mail-config.glade.h:130
-msgid "Work"
-msgstr "Εργασία"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:84
-msgid "Personal"
-msgstr "Προσωπικό"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:71
-#: mail/mail-config.glade.h:121
-msgid "To Do"
-msgstr "Πρός Τακτοποίηση"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:65
-msgid "Later"
-msgstr "Αργότερα"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:62
-msgid "Test"
-msgstr "Δοκιμή"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Πρέπει να δώσετε όνομα σ' αυτό το φίλτρο."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "'Όνομα κανόνα: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Χωρίς τίτλο"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Αν"
-
-#: filter/filter-rule.c:790
-msgid "Execute actions"
-msgstr "Εκτέλεση ενεργειών"
-
-#: filter/filter-rule.c:794
-msgid "if all criteria are met"
-msgstr "αν ικανοποιηθούν όλα τα κριτήρια"
-
-#: filter/filter-rule.c:799
-msgid "if any criteria are met"
-msgstr "αν ικανοποιηθούν κάποια από τα κριτήρια"
-
-#: filter/filter-rule.c:894
-msgid "incoming"
-msgstr "εισερχόμενα"
-
-#: filter/filter-rule.c:894
-msgid "outgoing"
-msgstr "εξερχόμενα"
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "χρόνια"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
@@ -11190,225 +11358,226 @@ msgid "Beep"
 msgstr "Ήχος"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "περιέχει"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Αντιγραφή σε Φάκελο"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ημερομηνία παραλαβής"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Ημερομηνία αποστολής"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Διαγραμμένα"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "δεν περιέχει"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "δεν τελειώνει με"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "δεν υπάρχει"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not return"
+msgstr "δεν επιστρέφει"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "δεν φαίνεται να είναι"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "δεν ξεκινά με"
+
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Δεν Υπάρχει"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Πρόχειρα"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "τελείωνε με"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Υπάρχει"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "υπάρχει"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Έκφραση"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1840
+#: filter/libfilter-i18n.h:27
+msgid "is"
+msgstr "είναι"
+
+#: filter/libfilter-i18n.h:28
+msgid "is after"
+msgstr "ήταν μετά"
+
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "ήταν πριν"
+
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr "έχει σημαία"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "είναι μεγαλύτερο από"
+
+#: filter/libfilter-i18n.h:32
+msgid "is less than"
+msgstr "είναι μικρότερο από"
+
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "δεν είναι"
+
+#: filter/libfilter-i18n.h:34
+msgid "is not Flagged"
+msgstr "δεν έχει σημαία"
+
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 msgid "Label"
 msgstr "Ετικέτα"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Λίστα Ταχυδρομείου"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Σώμα Μηνύματος"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Επικεφαλίδα Μηνύματος"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Μετακίνηση σε Φάκελο"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 msgid "Pipe Message to Shell Command"
 msgstr "Σωλήνωση μηνύματος στην εντολή κελύφους"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Εκτέλεση Ήχου"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr "Αναγνωσμένα"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Παραλήπτες"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Ταίριασμα κανον. έκφρ."
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Απαντημένα στους"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:46
+msgid "returns"
+msgstr "επιστρέφει"
+
+#: filter/libfilter-i18n.h:47
+msgid "returns greater than"
+msgstr "επιστρέφει μεγαλύτερο από"
+
+#: filter/libfilter-i18n.h:48
+msgid "returns less than"
+msgstr "επιστρέφει λιγότερο από"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Σκορ"
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1799
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Αποστολέας"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Ορισμός Κατάστασης"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:52
 msgid "Shell Command"
 msgstr "Εντολή κελύφους"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Μέγεθος (kB)"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "φαίνεται να είναι"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Πηγαίος Λογαριασμός"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Ακριβής επικεφαλίδα"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "ξεκινά με"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Τερματισμός Επεξεργασίας"
 
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:906
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
 #: mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Θέμα"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:61
 msgid "Unset Status"
 msgstr "Ορισμός Κατάστασης"
 
-#: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "περιέχει"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "δεν περιέχει"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "δεν τελειώνει με"
-
-#: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "δεν υπάρχει"
-
-#: filter/libfilter-i18n.h:44
-msgid "does not return"
-msgstr "δεν επιστρέφει"
-
-#: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "δεν φαίνεται να είναι"
-
-#: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "δεν ξεκινά με"
-
-#: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "τελείωνε με"
-
-#: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "υπάρχει"
-
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "έχει σημαία"
-
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "ήταν μετά"
-
-#: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "ήταν πριν"
-
-#: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "είναι μεγαλύτερο από"
-
-#: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "είναι μικρότερο από"
-
-#: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "δεν έχει σημαία"
-
-#: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "δεν είναι"
-
-#: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "είναι"
-
-#: filter/libfilter-i18n.h:57
-msgid "returns greater than"
-msgstr "επιστρέφει μεγαλύτερο από"
-
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
-msgstr "επιστρέφει λιγότερο από"
-
-#: filter/libfilter-i18n.h:59
-msgid "returns"
-msgstr "επιστρέφει"
-
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "φαίνεται να είναι"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "ξεκινά με"
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
+#, c-format
+msgid "Rule name '%s' is not unique, choose another."
+msgstr "Το όνομα κανόνα '%s' δεν είναι μοναδικό, επιλέξτε ένα άλλο."
 
 #: filter/rule-editor.c:170
 msgid "Rules"
 msgstr "Κανόνες"
 
-#: filter/rule-editor.c:241 filter/rule-editor.c:325
-#, c-format
-msgid "Rule name '%s' is not unique, choose another."
-msgstr "Το όνομα κανόνα '%s' δεν είναι μοναδικό, επιλέξτε ένα άλλο."
-
 #: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Προσθήκη Κανόνα"
@@ -11425,11 +11594,11 @@ msgstr "'Όνομα κανόνα: "
 msgid "Score Rules"
 msgstr "Κανόνες Σκορ"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "Πρέπει να δώσετε όνομα στον eφάκελο."
 
-#: filter/vfolder-rule.c:220
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr "Πρέπει να δηλώσετε τουλάχιστον έναν φάκελο σαν πηγή."
 
@@ -11437,39 +11606,44 @@ msgstr "Πρέπει να δηλώσετε τουλάχιστον έναν φά�
 msgid "VFolder source"
 msgstr "Πηγή εΦακέλων"
 
-#: importers/elm-importer.c:95
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution εισάγει τα παλαιά σας Elm μηνύματα"
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr "Γίνεται εισαγωγή..."
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr "Παρακαλώ περιμένετε"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Εισάγεται %s ως %s"
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, c-format
 msgid "Scanning %s"
 msgstr "Γίνεται σάρωση του %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:113
-#: mail/folder-browser-ui.c:357
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
 msgstr "Μηνύματα"
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11477,7 +11651,7 @@ msgstr ""
 "Το Evolution βρήκε μηνύματα Elm\n"
 "Θέλετε να γίνει εισαγωγή στο Evolution;"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11489,12 +11663,12 @@ msgstr ""
 "Το Evolution βρήκε μηνύματα Elm\n"
 "Θέλετε να εισαχθούν στο Evolution;"
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Φίλτρο προτεραιότητας \"%s\""
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11521,7 +11695,7 @@ msgstr ""
 "εισηγμένα\n"
 "φίλτρα για να δείτε αν όλα λειτουργούν όπως πρέπει."
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11533,7 +11707,7 @@ msgstr ""
 "τα οποία δεν υποστηρίζονται από το Evolution.\n"
 "Αυτά τα φίλτρα δεν θα χρησιμοποιηθούν."
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11542,37 +11716,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr "Το Evolution εισάγει τα παλαιά σας δεδομένα Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1092
-#: shell/e-local-storage.c:184
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Απορρίμματα"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Ανάγνωση νέων μηνυμάτων"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr "Σαρώνεται ο κατάλογος"
 
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Εκκίνηση εισαγωγής"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr "Φίλτρα μηνυμάτων"
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11580,11 +11756,11 @@ msgstr ""
 "Το Evolution βρήκε μηνύματα Netscape\n"
 "Θέλετε να εισαχθούν στο Evolution;"
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr "Το Evolution εισάγει τα παλαιά σας δεδομένα Pine"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -11592,43 +11768,124 @@ msgstr ""
 "Το Evolution βρήκε μηνύματα Pine\n"
 "Θέλετε να εισαχθούν στο Evolution;"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/component-factory.c:113
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Προτιμήσεις Επεξεργαστή"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Ρύθμιστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της "
+"ασφάλειας και της προβολής μηνυμάτων"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure the fonts used by Evolution here"
+msgstr "Ρυθμίστε εδώ τις γραμματοσειρές που χρησιμοποιούνται από το Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Ρυθμίστε εδώ τους λογαριασμούς αλληλογραφίας σας"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Επεξεργαστής Λογαριασμού Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Διεπαφή ρυθμίσεων Μηνυμάτων"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Συστατικό για την προβολή φακέλου μηνυμάτων του Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Συστατικό του Evolution για το εργοστάσιο φακέλου μηνυμάτων."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Στοιχείο εκτελεστικής σύνοψης μηνυμάτων."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "Font Preferences"
+msgstr "Προτιμήσεις Γραμματοσειράς"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Mail Accounts"
+msgstr "Λογαριασμοί αλληλογραφίας"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Προτιμήσεις Αλληλογραφίας"
+
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Φάκελος που περιέχει μηνύματα"
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Κοινόχρηστη αλληλογραφία"
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Κοινόχρηστος φάκελος που περιέχει μηνύματα"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Εικονικά Απορρίμματα"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Εικονικός Φάκελος Απορριμμάτων"
 
-#: mail/component-factory.c:143
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Αυτός ο φάκελος δεν μπορεί να περιέχει μηνύματα."
 
-#: mail/component-factory.c:437
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Ιδιότητες..."
 
-#: mail/component-factory.c:437
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Αλλαγή των ιδιοτήτων του φακέλου"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11636,377 +11893,266 @@ msgstr ""
 "Μερικές από τις ρυθμίσεις του ταχυδρομείου σας φαίνεται να είναι "
 "κατεστραμμένες, παρακαλώ ελέγξτε ότι όλα είναι σωστά."
 
-#: mail/component-factory.c:988
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Δεν έχετε ορίσει τρόπο μεταφορά των μηνυμάτων"
 
-#: mail/component-factory.c:1012
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Έχετε μηνύματα που δεν έχουν αποσταλεί, θέλετε να βγείτε οπωσδήποτε? "
 
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Νέο Μήνυμα Ταχυδρομείου"
 
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_Αποστολή Μηνύματος"
 
-#: mail/component-factory.c:1053
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1069
 msgid "New Message Post"
 msgstr "Αποστολή  νέου μηνύματος"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr "Α_ποστολή μηνύματος"
 
-#: mail/component-factory.c:1062
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "Αποστολή ενός νέου μηνύματος"
 
-#: mail/component-factory.c:1090
-msgid "Cannot initialize the Evolution mail component."
-msgstr ""
-"Δεν είναι δυνατή η αρχικοποίηση του συστατικού μηνυμάτων του Evolution."
-
-#: mail/component-factory.c:1099
-msgid "Cannot initialize Evolution's mail config component."
-msgstr ""
-"Δεν είναι δυνατή η αρχικοποίηση του συστατικού ρύθμισης μηνυμάτων του "
-"Evolution."
-
-#: mail/component-factory.c:1105
-msgid "Cannot initialize Evolution's folder info component."
-msgstr ""
-"Δεν είναι δυνατή η αρχικοποίηση του συστατικού πληροφοριών φακέλου του "
-"Evolution."
-
-#: mail/component-factory.c:1346 mail/component-factory.c:1376
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "Σύνδεση..."
 
-#: mail/component-factory.c:1387
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Δεν είναι δυνατό να γίνει καταχώρηση αποθήκευσης με κέλυφος"
 
-#: mail/folder-browser.c:346 mail/mail-display.c:388 mail/mail-display.c:907
+#: mail/folder-browser-ui.c:485
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Ιδιότητες για \"%s\""
+
+#: mail/folder-browser-ui.c:487
+msgid "Properties"
+msgstr "Ιδιότητες"
+
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Δεν είναι δυνατή η δημιουργία του προσωρινού καταλόγου: %s"
 
-#: mail/folder-browser.c:801
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d νέα"
 
-#: mail/folder-browser.c:804 mail/folder-browser.c:812
-#: mail/folder-browser.c:815
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:806
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr "%d κρυμμένα"
 
-#: mail/folder-browser.c:808
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr "%d ορατά"
 
-#: mail/folder-browser.c:813
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr "%d επιλεγμένα"
 
-#: mail/folder-browser.c:818
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d μη απεσταλμένα"
 
-#: mail/folder-browser.c:820
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "%d απεσταλμένα"
 
-#: mail/folder-browser.c:822
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "%d συνολικά"
 
-#: mail/folder-browser.c:1187
+#: mail/folder-browser.c:1182
 msgid "Create _Virtual Folder From Search..."
 msgstr "Δημιουργία Ει_κονικού Φακέλου Από το Μήνυμα"
 
-#: mail/folder-browser.c:1776
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "ΕΦάκελος στο _Θέμα"
 
-#: mail/folder-browser.c:1777
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "ΕΦάκελος στον _Αποστολέα"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "ΕΦάκελος στους παραλήπτες"
 
-#: mail/folder-browser.c:1779
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "ΕΦάκελος στη Λίστα _Ταχυδρομείου"
 
-#: mail/folder-browser.c:1783
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Φίλτρο στο Θέμα"
 
-#: mail/folder-browser.c:1784
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Φίλτρο στον Αποστολέα"
 
-#: mail/folder-browser.c:1785
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Φίλτρο στους Παραλήπτες"
 
-#: mail/folder-browser.c:1786 mail/folder-browser.c:2109
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr "Φίλτρο στη Λίστα Ταχυδρομείου"
 
-#: mail/folder-browser.c:1804
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "_Επεξεργασία ως Νέο Μήνυμα..."
 
-#: mail/folder-browser.c:1806
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_Εκτύπωση"
 
-#: mail/folder-browser.c:1810 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Απάντηση στον Αποστολέα"
 
-#: mail/folder-browser.c:1811 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Απάντηση στη _Λίστα"
 
-#: mail/folder-browser.c:1812 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Απάντηση σε _Όλους"
 
-#: mail/folder-browser.c:1813
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Προώθηση"
 
-#: mail/folder-browser.c:1817
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1818
+#: mail/folder-browser.c:1771
 msgid "Fla_g Completed"
 msgstr "Ση_μαία Ολοκληρώθηκε"
 
-#: mail/folder-browser.c:1819
+#: mail/folder-browser.c:1772
 msgid "Cl_ear Flag"
 msgstr "Εκκα_θάριση Σημαίας"
 
 #. separator here?
-#: mail/folder-browser.c:1823 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Σήμανση _ως Αναγνωσμένα"
 
-#: mail/folder-browser.c:1824
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr "Σήμανση ως Μη Αναγν_ωσμένα"
 
-#: mail/folder-browser.c:1825
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Σήμανση _ως Σημαντικά"
 
-#: mail/folder-browser.c:1826
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr "Σή_μανση ως Μη Σημαντικά"
 
-#: mail/folder-browser.c:1831
+#: mail/folder-browser.c:1784
 msgid "U_ndelete"
 msgstr "Α_κύρωση Διαγραφής"
 
-#: mail/folder-browser.c:1835
+#: mail/folder-browser.c:1788
 msgid "Mo_ve to Folder..."
 msgstr "Με_τακίνηση στο Φάκελο..."
 
-#: mail/folder-browser.c:1836 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Αντιγραφή στο Φάκελο..."
 
-#: mail/folder-browser.c:1844
+#: mail/folder-browser.c:1797
 msgid "Add Sender to Address_book"
 msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
 
-#: mail/folder-browser.c:1848
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr "Εφαρμο_γή Φίλτρων"
 
-#: mail/folder-browser.c:1852
+#: mail/folder-browser.c:1805
 msgid "Crea_te Rule From Message"
 msgstr "Δη_μιουργία Κανόνα Από το Μήνυμα"
 
-#: mail/folder-browser.c:2110
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr "ΕΦάκελος στη Λίστα Ταχυδρομείου"
 
-#: mail/folder-browser.c:2112
+#: mail/folder-browser.c:2066
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Φίλτρο στη Λίστα Τα_χυδρομείου (%s)"
 
-#: mail/folder-browser.c:2113
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "ΕΦάκελος στη Λίστα Τ_αχυδρομείου (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Εξ ορισμού"
 
-#: mail/folder-browser-ui.c:484
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Ιδιότητες για \"%s\""
-
-#: mail/folder-browser-ui.c:486
-msgid "Properties"
-msgstr "Ιδιότητες"
-
 #: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Λήψη Πληροφοριών Φακέλου"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Προτιμήσεις Επεξεργαστή"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Έλεγχος ρυθμίσεων για την προβολή γραμματοσειρών του Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Έλεγχος ρυθμίσεων για τους λογαριασμούς αλληλογραφίας του Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Έλεγχος ρυθμίσεων για την αλληλογραφία του Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Έλεγχος ρυθμίσεων για τον επεξεργαστή μηνυμάτων του Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Ρύθμιστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της "
-"ασφάλειας και της προβολής μηνυμάτων"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Configure the fonts used by Evolution here"
-msgstr "Ρυθμίστε εδώ τις γραμματοσειρές που χρησιμοποιούνται από το Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Configure your email accounts here"
-msgstr "Ρυθμίστε εδώ τους λογαριασμούς αλληλογραφίας σας"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Συστατικό Evolution για την διαχείριση μηνυμάτων."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
 msgstr "Επεξεργαστής μηνυμάτων του Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Στοιχείο εκτελεστικής σύνοψης μηνυμάτων."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Συστατικό για την προβολή φακέλου μηνυμάτων του Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Συστατικό του Evolution για το εργοστάσιο φακέλου μηνυμάτων."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Εργοστάσιο για τον επεξεργαστή του Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "Συστατικό για το εργοστάσιο περίληψης Μηνυμάτων."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "Font Preferences"
-msgstr "Προτιμήσεις Γραμματοσειράς"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
-#: mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Mail Accounts"
-msgstr "Λογαριασμοί αλληλογραφίας"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19
-#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Προτιμήσεις Αλληλογραφίας"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "Διεπαφή ρυθμίσεων Μηνυμάτων"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr ""
-"Εργοστάσιο για τους ελέγχους που εξάγονται από την αλληλογραφία Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Εργοστάσιο για την εισαγωγή αρχείων mbox στο Evolution"
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Εισάγει αρχεία mbox στο Evolution"
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Εργοστάσιο για την εισαγωγή μηνύματα Outlook Express 4 στο Evolution"
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Εισάγει αρχεία Outlook Express 4 στο Evolution"
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12051,55 +12197,55 @@ msgstr "Δεν έχετε συμπληρώσει όλα τις απαιτούμ�
 msgid "Evolution Account Editor"
 msgstr "Επεξεργαστής Λογαριασμού Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:154
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Σύστημα:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:124
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Όνομα Χρήστη:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_Θέση:"
 
-#: mail/mail-account-gui.c:1850
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Δεν επιτρέπεται να δημιουργήσετε δύο λογαριασμούς με το ίδιο όνομα."
 
-#: mail/mail-accounts.c:217
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Είστε βέβαιοι για την διαγραφή αυτού του λογαριασμού;"
 
-#: mail/mail-accounts.c:225
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Να μην διαγραφεί"
 
-#: mail/mail-accounts.c:300 mail/mail-accounts.c:338
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
-#: mail/mail-accounts.c:300 mail/mail-accounts.c:340
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
 #. translators: default account indicator
-#: mail/mail-accounts.c:380
+#: mail/mail-accounts.c:433
 msgid "[Default]"
 msgstr "[Εξ ορισμού]"
 
-#: mail/mail-accounts.c:425 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:811
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr "Ενεργοποίηση"
 
-#: mail/mail-accounts.c:430 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Όνομα λογαριασμού:"
 
-#: mail/mail-accounts.c:432 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
@@ -12143,11 +12289,11 @@ msgstr ""
 "Και έχει ανανεωθεί."
 
 #. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:102 widgets/misc/e-messagebox.c:226
+#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
 msgid "Don't show this message again."
 msgstr "Να μην ξαναεμφανιστεί αυτό το μήνυμα"
 
-#: mail/mail-callbacks.c:191
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -12159,7 +12305,7 @@ msgstr ""
 "ή συγγραφή μηνυμάτων\n"
 "Θέλετε να κάνετε την ρύθμιση τώρα;"
 
-#: mail/mail-callbacks.c:214
+#: mail/mail-callbacks.c:211
 msgid ""
 "You need to configure an account\n"
 "before you can compose mail."
@@ -12167,7 +12313,7 @@ msgstr ""
 "Πρέπει να ρυθμίσετε έναν λογαριασμό\n"
 "πριν από την συγγραφή μηνύματος"
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12175,7 +12321,7 @@ msgstr ""
 "Πρέπει να ρυθμίσετε μια ταυτότητα\n"
 "πριν από την συγγραφή μηνύματος"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12184,7 +12330,7 @@ msgstr ""
 "πριν από την συγγραφή μηνύματος"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:257
+#: mail/mail-callbacks.c:254
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
@@ -12192,11 +12338,11 @@ msgstr ""
 "Θα στείλετε μήνυμα σε μορφή HTML. Παρακαλώ βεβαιωθείτε ότι\n"
 " παρακάτω παραλήπτες επιθυμούν μηνύματα σε μορφή HTML:\n"
 
-#: mail/mail-callbacks.c:269
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Να σταλεί οπωσδήποτε;"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12204,7 +12350,7 @@ msgstr ""
 "Αυτό το μήνυμα δεν έχει θέμα.\n"
 "Να σταλεί;"
 
-#: mail/mail-callbacks.c:317
+#: mail/mail-callbacks.c:313
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -12213,12 +12359,12 @@ msgstr ""
 "διευθύνσεις, αυτό το μήνυμα θα περιέχει μόνο παραλήπτες στην Ιδιαίτερη "
 "κοινοποίηση(Bcc)."
 
-#: mail/mail-callbacks.c:321
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr ""
 "Αυτό το μήνυμα περιέχει μόνο παραλήπτες στο Ιδιαίτερης κοινοποίησηςBcc)."
 
-#: mail/mail-callbacks.c:326
+#: mail/mail-callbacks.c:322
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -12228,11 +12374,11 @@ msgstr ""
 "προσθήκη μια εμφανή επικεφαλίδα Προς.\n"
 "Να σταλεί ούτως η άλλως;"
 
-#: mail/mail-callbacks.c:460
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Πρέπει να ορίσετε παραλήπτες προκειμένου να στείλετε αυτό το μήνυμα."
 
-#: mail/mail-callbacks.c:716
+#: mail/mail-callbacks.c:722
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -12241,28 +12387,28 @@ msgstr ""
 "λογαριασμό.\n"
 "Θέλετε να κάνετε χρήση του εξ' ορισμού προσωρινού φακέλου;"
 
-#: mail/mail-callbacks.c:1177
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "ένας άγνωστος αποστολέας"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Στις %d/%b/%Y, ημέρα %A και ώρα %H:%M, ο/η %%s έγραψε:"
 
-#: mail/mail-callbacks.c:1679 mail/message-browser.c:143
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "Μετακίνηση μηνύματος(ων) στο"
 
-#: mail/mail-callbacks.c:1681 mail/message-browser.c:145
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Αντιγραφή μηνύματος(ων) στο"
 
-#: mail/mail-callbacks.c:2325
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Είστε βέβαιοι ότι θέλετε να επεξεργαστείτε και τα %d μηνύματα;"
 
-#: mail/mail-callbacks.c:2341
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12270,7 +12416,7 @@ msgstr ""
 "Επιτρέπεται να επεξεργαστείτε μόνο τα\n"
 "μηνύματα στον Πρόχειρο Φάκελο."
 
-#: mail/mail-callbacks.c:2377
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12278,16 +12424,16 @@ msgstr ""
 "Επιτρέπεται να ξαναστείλετε μόνο τα\n"
 "μηνύματα από τον φάκελο Απεσταλμένα."
 
-#: mail/mail-callbacks.c:2387
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Είστε βέβαιοι ότι θέλετε να ξαναστείλετε και τα %d μηνύματα;"
 
-#: mail/mail-callbacks.c:2407
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Δεν Έχει Επιλεγεί Μήνυμα"
 
-#: mail/mail-callbacks.c:2448
+#: mail/mail-callbacks.c:2465
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12296,7 +12442,7 @@ msgstr ""
 "Αδυναμία αποθήκευσης σε `%s'\n"
 " %s"
 
-#: mail/mail-callbacks.c:2453
+#: mail/mail-callbacks.c:2470
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12305,15 +12451,15 @@ msgstr ""
 "Το %s υπάρχει ήδη.\n"
 "Θέλετε να αντικατασταθεί;"
 
-#: mail/mail-callbacks.c:2494
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Αποθήκευση Μηνύματος Ως..."
 
-#: mail/mail-callbacks.c:2496
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Αποθήκευση Μηνυμάτων Ως..."
 
-#: mail/mail-callbacks.c:2664
+#: mail/mail-callbacks.c:2687
 msgid ""
 "This operation will permanently erase all messages marked as\n"
 "deleted. If you continue, you will not be able to recover these messages.\n"
@@ -12326,7 +12472,7 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
 
-#: mail/mail-callbacks.c:2750
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12335,71 +12481,59 @@ msgstr ""
 "Σφάλμα κατά το φόρτωμα των πληροφοριών:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2758
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Φίλτρα"
 
-#: mail/mail-callbacks.c:2800
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "Σελίδα %d από %d"
 
-#: mail/mail-callbacks.c:2855
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Εκτύπωση Μηνύματος"
 
-#: mail/mail-callbacks.c:2914
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Απέτυχε η εκτύπωση του μηνύματος"
 
-#: mail/mail-callbacks.c:3106
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Είστε βέβαιοι ότι θέλετε να ανοίξετε και τα %d μηνύματα σε άλλα παράθυρα;"
 
-#: mail/mail-composer-prefs.c:226
-msgid ""
-"Please specify signature filename\n"
-"in Advanced section of signature settings."
-msgstr ""
-"Παρακαλώ καθορίστε το όνομα αρχείου υπογραφής\n"
-"στον τομέα Για προχωρημένους στις ρυθμίσεις υπογραφής."
-
-#: mail/mail-composer-prefs.c:245 mail/mail-composer-prefs.c:247
-#: mail/mail-composer-prefs.c:376 mail/mail-composer-prefs.c:431
-msgid "[script]"
-msgstr "[δέσμη ενεργειών]"
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+msgid "Unnamed"
+msgstr "Χωρίς Τίτλο"
 
-#: mail/mail-composer-prefs.c:320
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr "Θα πρέπει να καθορίσετε ένα έγκυρο όνομα δέσμης ενεργειών."
 
-#: mail/mail-composer-prefs.c:335 mail/mail-config.c:1421
-msgid "Unnamed"
-msgstr "Χωρίς Τίτλο"
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+msgid "[script]"
+msgstr "[δέσμη ενεργειών]"
 
-#: mail/mail-composer-prefs.c:815
+#: mail/mail-composer-prefs.c:864
 msgid "Language(s)"
 msgstr "Γλώσσα"
 
-#: mail/mail-composer-prefs.c:859
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Προσθήκη δέσμης ενεργειών υπογραφής"
 
-#: mail/mail-composer-prefs.c:878
+#: mail/mail-composer-prefs.c:926
 msgid "Signature(s)"
 msgstr "Υπογραφή"
 
-#: mail/mail-config.c:1125
-msgid "Checking Service"
-msgstr "Γίνεται Έλεγχος Υπηρεσίας"
-
-#: mail/mail-config.c:1203 mail/mail-config.c:1207
-msgid "Connecting to server..."
-msgstr "Σύνδεση στον διακομιστή..."
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Ταυτότητα"
 
-#: mail/mail-config-druid.c:147
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12410,7 +12544,12 @@ msgstr ""
 "συμπληρωθούν εκτός αν θέλετε να συμπεριλάβετε αυτές τις πληροφορίες όταν "
 "στέλνετε μηνύματα."
 
-#: mail/mail-config-druid.c:149
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "_Λήψη Μηνυμάτων"
+
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12419,11 +12558,16 @@ msgstr ""
 "δεν είστε βέβαιοι ρωτήστε τον διαχειριστή δικτύου σας ή τον παροχέα "
 "διαδικτύου"
 
-#: mail/mail-config-druid.c:151
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Παρακαλώ επιλέξτε ανάμεσα ανάμεσα στις παρακάτω επιλογές"
 
-#: mail/mail-config-druid.c:153
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Απο_στολή αλληλογραφίας"
+
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12432,7 +12576,11 @@ msgstr ""
 "μηνυμάτων. Αν δεν είστε βέβαιοι ρωτήστε τον διαχειριστή δικτύου σας ή τον "
 "Παροχέα Διαδικτύου."
 
-#: mail/mail-config-druid.c:155
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Διαχείριση Λογαριασμού"
+
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12446,133 +12594,133 @@ msgstr ""
 "ταχυδρομείου Evolution. Παρακαλώ εισάγετε ένα όνομα στο παρακάτω κενό.Το "
 "όνομα είναι μόνο για να προβάλει τον λογαριασμό."
 
-#. set window title
-#: mail/mail-config-druid.c:645
-msgid "Evolution Account Assistant"
-msgstr "Βοηθός Λογαριασμού Evolution"
+#: mail/mail-config.c:994
+msgid "Checking Service"
+msgstr "Γίνεται Έλεγχος Υπηρεσίας"
+
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
+msgid "Connecting to server..."
+msgstr "Σύνδεση στον διακομιστή..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Έλεγχος για του υποστηριζόμενος τύπους "
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(το SSL δεν υποστηρίζεται σε αυτή την έκδοση του evolution)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(το SSL δεν υποστηρίζεται σε αυτή την έκδοση του evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Να γίνεται πάντα κρυπτογράφηση στον εαυτό μου κατά την αποστολή "
 "κρυπτογραφημένων μηνυμάτων"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr "Επεξεργαστής Λογαριασμού"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Πληροφορίες Λογαριασμού"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Διαχείριση Λογαριασμού"
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
 msgstr "Προσθήκη _δέσμης ενεργειών"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Add new signature..."
 msgstr "Προσθήκη νέας υπογραφής..."
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Να γίνεται πάντα κ_ρυπτογράφηση στον εαυτό μου κατά την αποστολή "
 "κρυπτογραφημένων μηνυμάτων"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Να _υπογράφονται πάντα τα μηνύματα στην χρήση αυτού του λογαριασμού"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Πάντοτε _κρυφή κοινοποίηση (Bcc) σε:"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Πάντοτε κοι_νοποίηση (Cc) σε:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 "Να είναι πάντοτε έμπισ_τα τα κλειδία στην κλειδοθήκη μου κατά την "
 "κρυπτογράφηση"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Επισύναψη αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Συννημένο"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Πιστοποίηση"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "Automatically _detect links"
 msgstr "Αυτόματος εν_τοπισμός δεσμών"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "C_haracter set:"
 msgstr "Κωδικοποίηση  _Χαρακτήρων"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "C_olors"
 msgstr "Χ_ρώματα"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Έλεγχος αλληλογραφίας κατά την πληκ_τρολόγηση"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Έλεγχος για Νέα Μηνύματα"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Χρώμα για ανορ_θόγραφες λέξεις:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Συγγραφή μηνυμάτων"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Ρυθμίσεις"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
+#, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
 "Συγχαρητήρια, οι ρυθμίσεις του ταχυδρομείου τελείωσε.\n"
 "\n"
@@ -12581,281 +12729,282 @@ msgstr ""
 "\n"
 "Επιλέξτε \"Τερματισμός\" για να αποθηκεύσετε τις ρυθμίσεις σας."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Εξ ορισμού"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Εξ ορισμού Συμπεριφορά"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Εξ' ορισμού κω_δικοποίηση χαρακτήρων: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Διαγραφή Αλληλογραφίας"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr "Ψηφιακές Ταυτότητες..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Να μην γίνεται παράθεση αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Να μην υπογράφονται αιτήσεις _συνατήσεων (για συμβατότητα με το Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Τέλος"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "_Φάκελος Προχείρων:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Ενεργοποίηση"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Λογαριασμοί Email"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Διεύ_θυνση Email:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Άδειασμα των φακέλων απορριμμά_των στην έξοδο"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Βοηθός Λογαριασμού Evolution"
+
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Εκτέλεση εντολής..."
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Στα_θερού_πλάτους"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:58
 msgid "Font Properties"
 msgstr "Ιδιότητες Γραμματοσειράς"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:59
 msgid "Format messages in _HTML"
 msgstr "Μορφοποίηση μυνημάτων σε _HTML"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "Λήψη ψηφιακής ταυτότητας..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Επισήμανση παρα_θέσεων με"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:60 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Ταυτότητα"
-
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Μέσα στο μήνυμα"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Ετικέτες και Χρώματα"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Φόρτωση Εικόνων"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Ρυθμίσεις Ταχυδρομείου"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Θέση Mailbox"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Επεξεργαστής Μηνύματος"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Προβολή Μηνύματος"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Μήνυμα περιέχει"
+
+#: mail/mail-config.glade.h:76
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Ειδοποίηση Νέου Μηνύματος"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
 
-#: mail/mail-config.glade.h:77
-msgid "On Screen fonts"
-msgstr "Γραμματοσειρές Οθόνης"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Προαιρετικές Πληροφορίες"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "Or_ganization:"
 msgstr "Ορ_γανισμός:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Διαλέξτε χρώμα"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Ερώτηση στην αποστολή μηνυμάτων όπου έχουν οριστεί μόνο παραλήπτες στην "
 "κρυφή _κοινοποίηση (Bcc)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Printed Fonts"
 msgstr "Εκτυπωμένες γραμματοσειρές"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quote original message"
 msgstr "Παράθεση αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Με παράθεση"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "_Απομνημόνευση αυτού του κωδικού πρόσβασης"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr "Α_πάντηση Σε:"
 
-#: mail/mail-config.glade.h:94 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "Γίνεται Λήψη Μηνύματος"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Receiving _Options"
 msgstr "Επιλ_ογές Λήψης"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr "Απομνημόνευση του κωδικού _πρόσβασης"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Απαιτούμενες Πληροφορίες"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Restore Defaults"
 msgstr "Επαναφορά Εξ' ορισμού"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "Ασφάλ_εια"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "Ασφαλές MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr "Επιλογή γραμματοσειράς HTML σταθερού πλάτους "
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr "Επιλογή γραμματοσειράς HTML σταθερού πλάτους για εκτύπωση"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr "Επιλογή γραμματοσειράς HTML μεταβλητού πλάτους "
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr "Επιλογή γραμματοσειράς HTML μεταβλητού πλάτους για εκτύπωση"
 
-#: mail/mail-config.glade.h:106 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "Αποστέλλονται τα μηνύματα"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Φάκελος _απεσταλμένων μηνυμάτων:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Απεσταλμένα και Πρόχειρα Μηνύματα"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Ο _διακομιστής απαιτεί πιστοποίηση"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Ρυθμίσεις Διακομιστή"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "Είδος _Διακομιστή: "
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr "_Τύπος συντομεύσεων"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr "Ορισμός όνοματος αρ_χείου:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "Έλεγχος Ορ_θογραφίας"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12865,7 +13014,7 @@ msgstr ""
 "η υπογραφή σας. Το όνομα που θα καθορίσετε θα χρησιμοποιηθεί\n"
 "μόνο για την εμφάνιση."
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -12875,7 +13024,7 @@ msgstr ""
 "ελέγχου και της γλώσσας. Η λίστα των γλωσσών εδώ αντικατοπτρίζει μόνο τις "
 "γλώσσες για τις οποίες έχετε εγκαταστήσει το αντίστοιχο λεξικό."
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12883,177 +13032,184 @@ msgstr ""
 "Πληκτρολογήστε το όνομα με το οποίο θα αναφέρεστε για τον λογαριασμό.\n"
 "Για παράδειγμα: \"Work\" or \"Personal\" "
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Μετ_αβλητού πλάτους:"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
+#, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 "Καλώς ήρθατε στο Βοηθό Ρύθμισης Ταχυδρομείου Evolution.\n"
 "\n"
 "Επιλέξτε \"Επόμενο\" για να συνεχίσετε. "
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Προσθήκη υπογραφής"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Να γίνεται _πάντα φόρτωμα των εικόνων από το δικτύου"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Να _υπογράφονται πάντα τα μηνύματα στην χρήση αυτού του λογαριασμού"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Τύπος _Πιστοποίησης: "
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Τύπος _Πιστοποίησης: "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Αυτόματος έλεγχος για νέα μηνύματα"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Αυτόματη εισαγωγή εικονιδίων φατσούλας"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Ήχος κατά την άφιξη νέου μηνύματος"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_Πιστοποίηση Ταυτότητας:"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "Επι_βεβαίωση στην εξάλειψη από έναν φάκελο"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr "_Εξ ορισμού Υπογραφή:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "_Εξ' ορισμού"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Να μην ειδοποιούμαι για νέα μηνύματα"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "_Ενεργοποίηση"
 
-#: mail/mail-config.glade.h:149
-msgid "_Fixed-width:"
-msgstr "_Σταθερού πλάτους"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "_Forward style:"
 msgstr " Στυλ προώ_θησης:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "Π_λήρες Όνομα:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "Αλληλογραφία _HTML"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "Τα_υτότητα"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_Φόρτωση εικόνων αν ο αποστολέας υπάρχει στο βιβλίο διευθύνσεων"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "Αυτός είναι ο _εξ' ορισμού λογαριασμός"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Σήμανση μηνυμάτων ως αναγνωσμένα μετά από"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Όνομα:"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Να μην φορτώνονται ποτέ εικόνες από το δίκτυο"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "Ανα_παραγωγή ήχου κατά την άφιξη νέου μηνύματος"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Ερώ_τηση στην αποστολή μηνυμάτων HTML σε επαφές που δεν το θέλουν"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Ε_ρώτηση στην αποστολή μηνυμάτων με άδειο θέμα"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Λήψη Μηνυμάτων"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "Στυλ α_πάντησης:"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "_Επαναφορά Εξ ορισμού"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Δέσμη ενεργειών"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Απο_στολή αλληλογραφίας"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Εμφάνι_ση κινούμενων εικόνων"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Υπογραφές"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Άγιος Μαρίνος"
+
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Αρχική Επαφή:"
+
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Χρήση ασφαλούς σύνδεσης (SSL):"
 
-#: mail/mail-config.glade.h:173
-msgid "_Variable-width:"
-msgstr "_Μεταβλητού-πλάτους"
+#: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "_κάθε"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr " χρώμα"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "Περιγραφή"
 
@@ -13077,7 +13233,7 @@ msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομέ�
 msgid "Could not create a S/MIME decode context."
 msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων αποκρυπτογράφηση S/MIME."
 
-#: mail/mail-display.c:192
+#: mail/mail-display.c:193
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -13086,74 +13242,70 @@ msgstr ""
 "Το αρχείο `%s' υπάρχει ήδη\n"
 "Να αντικατασταθεί;"
 
-#: mail/mail-display.c:195
-msgid "Overwrite file?"
-msgstr "Επικάλυψη αρχείου;"
-
-#: mail/mail-display.c:330
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Αποθήκευση επισύναψης..."
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:406
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Δεν είναι δυνατή η δημιουργία προσωρινού αρχείου '%s': %s"
 
-#: mail/mail-display.c:451
+#: mail/mail-display.c:454
 msgid "Save Attachment..."
 msgstr "Αποθήκευση συνημμένου..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Προβολή μέσα στο μήνυμα"
 
-#: mail/mail-display.c:453
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Άνοιγμα με %s..."
 
-#: mail/mail-display.c:509
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Προβολή μέσα στο μήνυμα (μέσω %s)"
 
-#: mail/mail-display.c:513
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Απόκρυψη"
 
-#: mail/mail-display.c:533
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Εξωτερικό Πρόγραμμα Προβολής"
 
-#: mail/mail-display.c:1333
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr "Μεταφόρτωση εικόνων"
 
-#: mail/mail-display.c:1510
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Φόρτωμα περιεχόμενα μηνύματος"
 
-#: mail/mail-display.c:1852
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr "'Εχουν λήξει:"
 
-#: mail/mail-display.c:1856
+#: mail/mail-display.c:1883
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "από %B %d, %Y, %l:%M %P"
 
-#: mail/mail-display.c:2209
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Άνοιγμα Συνδέσμου στον Περιηγητή"
 
-#: mail/mail-display.c:2210
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Αντιγραφή Θέσης Συντόμευσης"
 
-#: mail/mail-display.c:2212
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Αποθήκευση δεσμού ως (FIXME)"
 
-#: mail/mail-display.c:2214
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Αποθήκευση εικόνας ως..."
 
@@ -13162,13 +13314,13 @@ msgstr "Αποθήκευση εικόνας ως..."
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: mail/mail-format.c:639
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr " %s επισύναψη"
 
-#: mail/mail-format.c:681 mail/mail-format.c:1367 mail/mail-format.c:1436
-#: mail/mail-format.c:1556 mail/mail-format.c:1680 mail/mail-format.c:1705
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος MIME. Προβολή ως πηγή."
 
@@ -13176,92 +13328,92 @@ msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: mail/mail-format.c:843
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Εσφαλμένη Διεύθυνση"
 
-#: mail/mail-format.c:884 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Από"
 
-#: mail/mail-format.c:888
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Απάντηση Σε"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Προς"
 
-#: mail/mail-format.c:898
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Αντίγραφο:"
 
-#: mail/mail-format.c:903
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Ιδιαίτερη Κοινοποίηση"
 
-#: mail/mail-format.c:1479
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο. Κάντε κλικ στο εικονίδιο με το "
 "λουκέτο για περισσότερες πληροφορίες."
 
-#: mail/mail-format.c:1507
+#: mail/mail-format.c:1479
 msgid "Could not create a PGP verfication context"
 msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων επαλήθευσης PGP."
 
-#: mail/mail-format.c:1515
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και βρέθηκε να είναι αυθεντικό."
 
-#: mail/mail-format.c:1522
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και δεν βρέθηκε να είναι "
 "αυθεντικό."
 
-#: mail/mail-format.c:1786
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Δείκτης σε σελίδα FTP (%s)"
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Δείκτης σε τοπικό αρχείο (%s) έγκυρο στην σελίδα \"%s\""
 
-#: mail/mail-format.c:1800
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Δείκτης σε τοπικό αρχείο (%s)"
 
-#: mail/mail-format.c:1827
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Δείκτης σε απομακρυσμένα δεδομένα (%s)"
 
-#: mail/mail-format.c:1833
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Δείκτης σε άγνωστα εξωτερικά δεδομένα (τύπος \"%s\")"
 
-#: mail/mail-format.c:1835
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Κακοδιατυπωμένο εξωτερικό μέρος μηνύματος."
 
-#: mail/mail-local.c:536 mail/mail-local.c:538
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, c-format
 msgid "Local folders/%s"
 msgstr "Τοπικοί Φάκελοι/%s"
 
-#: mail/mail-local.c:666
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Επαναρύθμιση φακέλου"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13270,22 +13422,22 @@ msgstr ""
 "Δεν είναι δυνατό να αποθηκευτεί ο φάκελος metainfo, μάλλον θα διαπιστώσετε\n"
 "ότι δεν μπορείτε να ανοίξετε πλέον αυτόν τον φάκελο: %s: %s"
 
-#: mail/mail-local.c:803
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Δεν είναι δυνατό να αποθηκευτεί ο φάκελος metainfo στο %s: %s"
 
-#: mail/mail-local.c:855
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Δεν ήταν δυνατό να διαγραφεί ο φάκελος metadata %s: %s"
 
-#: mail/mail-local.c:1325
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Γίνεται αλλαγή του φακέλου \"%s\" σε φορμά \"%s\""
 
-#: mail/mail-local.c:1347
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13293,16 +13445,16 @@ msgstr ""
 "Αν δεν μπορείτε να ανοίξετε πλέον αυτό το maibox, τότε\n"
 "θα πρέπει να το επισκευάστε μόνοι σας."
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Ρυθμίζεται ξανά ο /%s"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr "Δεν μπορείτε να αλλάξετε το φορμά ενός μη-τοπικού φακέλου."
 
-#: mail/mail-mt.c:256
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13311,7 +13463,7 @@ msgstr ""
 "Σφάλμα κατά '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13320,7 +13472,7 @@ msgstr ""
 "Σφάλμα κατά την εκτέλεση της λειτουργίας:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Εργάζεται"
 
@@ -13421,7 +13573,7 @@ msgstr "Παραλαμβάνονται %d μήνυμα(τα)"
 msgid "Saving %d messsage(s)"
 msgstr "Αποθήκευση %d μηνυμάτων"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13430,7 +13582,7 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία του αρχείου εξόδου: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13439,11 +13591,11 @@ msgstr ""
 "Σφάλμα κατά την αποθήκευση μηνυμάτων στο %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Αποθήκευση συννημένου"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13452,61 +13604,57 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία αρχείου εξόδου: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Δεν ήταν δυνατή η εγγραφή δεδομένων:%s"
 
-#: mail/mail-ops.c:2213
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Αποσύνδεση από το %s"
 
-#: mail/mail-ops.c:2213
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Επανασύνδεση στο %s"
 
-#: mail/mail-search.c:128
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Μήνυμα Χωρίς Τίτλο)"
 
-#: mail/mail-search.c:219
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Μήνυμα Χωρίς Τίτλο"
 
-#: mail/mail-search.c:221
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Κενό Μήνυμα"
 
-#: mail/mail-search.c:269
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Εύρεση στο Μήνυμα"
 
-#: mail/mail-search.c:272
+#: mail/mail-search.c:285
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Διάκριση πεζών κεφαλαίων"
 
-#: mail/mail-search.c:300
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "Αναζήτηση Προωθημένων"
 
-#: mail/mail-search.c:320
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Εύρεση:"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Ταιριάζει με:"
 
-#: mail/mail-search-dialogue.c:120 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_Αναζήτηση"
-
 #: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Γίνεται Ακύρωση..."
@@ -13542,24 +13690,24 @@ msgstr "Ανανέωση..."
 msgid "Waiting..."
 msgstr "Αναμονή..."
 
-#: mail/mail-session.c:214
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "Ο χρήστης ακύρωσε την λειτουργία."
 
-#: mail/mail-session.c:247
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Εισάγετε κωδικό πρόσβασης για %s"
 
-#: mail/mail-session.c:249
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Εισάγετε κωδικό πρόσβασης"
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:280
 msgid "_Remember this password"
 msgstr "_Απομνημόνευση αυτού του κωδικού"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:281
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 "Απο_μνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
@@ -13569,7 +13717,7 @@ msgstr ""
 msgid "Could not save signature file: %s"
 msgstr "Δεν ήταν δυνατή η αποθήκευση του αρχείου υπογραφής: %s"
 
-#: mail/mail-signature-editor.c:175
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13579,50 +13727,50 @@ msgstr ""
 "\n"
 "Θέλετε να αποθηκεύσετε τις αλλαγές τώρα;"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:229
 msgid "_Discard changes"
 msgstr "Α_πόρριψη αλλαγών"
 
-#: mail/mail-signature-editor.c:182
+#: mail/mail-signature-editor.c:233
 msgid "Save signature"
 msgstr "Αποθήκευση υπογραφής"
 
-#: mail/mail-signature-editor.c:327
+#: mail/mail-signature-editor.c:389
 msgid "Edit signature"
 msgstr "Επεξεργασία υπογραφής"
 
-#: mail/mail-signature-editor.c:363
+#: mail/mail-signature-editor.c:429
 msgid "Enter a name for this signature."
 msgstr "Εισάγετε ένα όνομα για αυτήν την υπογραφή."
 
-#: mail/mail-signature-editor.c:366 my-evolution/e-summary-preferences.c:622
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Προωθημένο μήνυμα - %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Προωθημένο μήνυμα"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Προωθημένο Μήνυμα"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ρύθμιση εφακέλου: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Αναβάθμιση εφακέλων για το uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13635,32 +13783,32 @@ msgstr ""
 "    '%s'\n"
 "Και έχει ανανεωθεί."
 
-#: mail/mail-vfolder.c:776 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "ΕΦάκελοι"
 
-#: mail/mail-vfolder.c:833
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "εΦάκελοι"
 
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Επεξεργασία ΕΦακέλου"
 
-#: mail/mail-vfolder.c:891
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Προσπάθεια επεξεργασίας εφακέλου '%s' που δεν υπάρχει."
 
-#: mail/mail-vfolder.c:944
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Νέος ΕΦάκελος"
 
-#: mail/message-browser.c:219
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Χωρίς Θέμα)"
 
-#: mail/message-browser.c:221
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Μήνυμα"
@@ -13701,31 +13849,31 @@ msgstr "Υψηλά"
 msgid "Highest"
 msgstr "Υψηλότερα"
 
-#: mail/message-list.c:1070
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1077
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "Σήμερα %l:%M %p"
 
-#: mail/message-list.c:1086
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Χθες %l:%M %p"
 
-#: mail/message-list.c:1098
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%l:%M %p %a"
 
-#: mail/message-list.c:1106
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2594
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Δημιουργία λίστας μηνυμάτων"
 
@@ -13819,12 +13967,12 @@ msgstr "_Λήξη: "
 msgid "_Flag:"
 msgstr "_Σημαία:"
 
-#: mail/subscribe-dialog.c:232
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Σάρωση φακέλων κάτω από %s στο \"%s\""
 
-#: mail/subscribe-dialog.c:234
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Σάρωση των ριζικών φακέλων στο \"%s\""
@@ -13839,31 +13987,23 @@ msgstr "Συνδρομή στον φάκελο \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Κατάργηση συνδρομής στον φάκελο \"%s\""
 
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Φάκελος"
 
-#: mail/subscribe-dialog.c:1427
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Ανάγνωση φακέλων..."
 
-#: mail/subscribe-dialog.c:1549
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Δεν έχει επιλεγεί διακομιστής"
 
-#: mail/subscribe-dialog.c:1624
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Παρακαλώ επιλέξτε διακομιστή."
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "All folders"
-msgstr "Όλοι οι φάκελοι"
-
-#: mail/subscribe-dialog.glade.h:2
-msgid "Apri file"
-msgstr "Apri file"
-
 #: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -13874,165 +14014,45 @@ msgid "Close"
 msgstr "Κλείσιμο"
 
 #: mail/subscribe-dialog.glade.h:4
-msgid "Display Options"
-msgstr "Ρυθμίσεις Εμφάνισης"
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr "Φάκελοι που το όνομά τους αρχίζει από:"
-
-#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr "Διαχείριση Συνδρομών"
 
-#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Ανανέωση Λίστας"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 msgid "S_elect server: "
 msgstr "Επι_λέξτε διακομιστή"
 
-#: mail/subscribe-dialog.glade.h:9
-msgid "Salve file"
-msgstr "Salve file"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Συνδρομή"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "_Κατάργηση Συνδρομής"
 
-#: my-evolution/component-factory.c:54
-msgid "Folder containing the Evolution Summary"
-msgstr "Φάκελος που περιέχει την περίληψη του Evolution"
-
-#: my-evolution/e-summary.c:199
-msgid "%A, %B %e %Y"
-msgstr "%A, %e %B  %Y"
-
-#: my-evolution/e-summary.c:514
-msgid "Please wait..."
-msgstr "Παρακαλώ περιμένετε..."
-
-#: my-evolution/e-summary.c:592 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Εκτύπωση Περίληψης"
-
-#: my-evolution/e-summary.c:626
-msgid "Printing of Summary failed"
-msgstr "Η Εκτύπωση Περίληψης απέτυχε"
-
-#: my-evolution/e-summary-calendar.c:377 my-evolution/e-summary-calendar.c:397
-msgid "Appointments"
-msgstr "Ραντεβού"
-
-#: my-evolution/e-summary-calendar.c:378
-msgid "No appointments"
-msgstr "Χωρίς Ραντεβού"
-
-#: my-evolution/e-summary-calendar.c:414
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:416
-msgid "%l:%M %d %B"
-msgstr "%l:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:434
-msgid "No description"
-msgstr "Χωρίς περιγραφή"
-
-#: my-evolution/e-summary-mail.c:156
-msgid "Mail summary"
-msgstr "Σύνοψη μηνυμάτων"
-
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1119
-msgid "Local Folders"
-msgstr "Τοπικοί Φάκελοι"
-
-#: my-evolution/e-summary-preferences.c:356
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Word of the Day"
-
-#: my-evolution/e-summary-preferences.c:374
-msgid "Quotes of the Day"
-msgstr "Φράσεις Ημέρας"
-
-#: my-evolution/e-summary-preferences.c:612
-msgid "Add a news feed"
-msgstr "Προσθήκη Τροφοδοσίας Ειδήσεων"
-
-#: my-evolution/e-summary-preferences.c:618
-msgid "Enter the URL of the news feed you wish to add"
-msgstr "Εισάγεται την ηλεκτρονική διεύθυνση των νέων που θέλετε να προσθέσετε"
-
-#: my-evolution/e-summary-rdf.c:303
-msgid "Error downloading RDF"
-msgstr "Σφάλμα κατά την λήψη του RDF"
-
-#: my-evolution/e-summary-rdf.c:446
-msgid "News Feed"
-msgstr "Τροφοδοσία Ειδήσεων"
-
-#: my-evolution/e-summary-shown.c:518
-msgid "All"
-msgstr "Όλα"
-
-#. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:530
-msgid "Add"
-msgstr "Προσθήκη"
-
-#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
-#, fuzzy
-msgid "Shown"
-msgstr "Σουηδία"
-
-#: my-evolution/e-summary-tasks.c:327
-msgid "No tasks"
-msgstr "Δεν υπάρχουν εργασίες"
-
-#: my-evolution/e-summary-tasks.c:371
-msgid "(No Description)"
-msgstr "(Χωρίς Περιγραφή)"
-
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr "Ο Καιρός μου"
-
-#: my-evolution/e-summary-weather.c:269
-msgid "There was an error downloading data for"
-msgstr "Σφάλμα μεταφόρτωσης δεδομένων για"
-
-#: my-evolution/e-summary-weather.c:490
-msgid "Weather"
-msgstr "Καιρός"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:592
-msgid "KBOS"
-msgstr "KBOS"
-
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configuration control for the Evolution Summary."
-msgstr "Έλεγχος ρυθμίσεων για την περίληψη του Evolution"
-
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Ρυθμίστε εδώ την εμφάνιση της περίληψης του Evolution"
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Στοιχείο περίληψης του Evolution."
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component."
+#, fuzzy
+msgid "Evolution Summary component"
 msgstr "Στοιχείο περίληψης του Evolution."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Στοιχείο περίληψης του Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "Ρυθμίσεις Περίληψης"
 
@@ -24421,6 +24441,122 @@ msgstr ""
 msgid "Zurich"
 msgstr "Ζυρίχη"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Φάκελος που περιέχει την περίληψη του Evolution"
+
+#: my-evolution/e-summary-calendar.c:380
+msgid "Appointments"
+msgstr "Ραντεβού"
+
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
+msgstr "Χωρίς Ραντεβού"
+
+#: my-evolution/e-summary-calendar.c:405
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:407
+#, fuzzy
+msgid "%l:%M%P %d %B"
+msgstr "%l:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:425
+msgid "No description"
+msgstr "Χωρίς περιγραφή"
+
+#: my-evolution/e-summary-mail.c:188
+msgid "Mail summary"
+msgstr "Σύνοψη μηνυμάτων"
+
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
+msgid "Local Folders"
+msgstr "Τοπικοί Φάκελοι"
+
+#: my-evolution/e-summary-preferences.c:356
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Word of the Day"
+
+#: my-evolution/e-summary-preferences.c:374
+msgid "Quotes of the Day"
+msgstr "Φράσεις Ημέρας"
+
+#: my-evolution/e-summary-preferences.c:615
+msgid "Add a news feed"
+msgstr "Προσθήκη Τροφοδοσίας Ειδήσεων"
+
+#: my-evolution/e-summary-preferences.c:621
+msgid "Enter the URL of the news feed you wish to add"
+msgstr "Εισάγεται την ηλεκτρονική διεύθυνση των νέων που θέλετε να προσθέσετε"
+
+#: my-evolution/e-summary-rdf.c:305
+msgid "Error downloading RDF"
+msgstr "Σφάλμα κατά την λήψη του RDF"
+
+#: my-evolution/e-summary-rdf.c:443
+msgid "News Feed"
+msgstr "Τροφοδοσία Ειδήσεων"
+
+#: my-evolution/e-summary-shown.c:518
+msgid "All"
+msgstr "Όλα"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:530
+msgid "Add"
+msgstr "Προσθήκη"
+
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Σουηδία"
+
+#: my-evolution/e-summary-tasks.c:329
+msgid "No tasks"
+msgstr "Δεν υπάρχουν εργασίες"
+
+#: my-evolution/e-summary-tasks.c:365
+msgid "(No Description)"
+msgstr "(Χωρίς Περιγραφή)"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr "Ο Καιρός μου"
+
+#: my-evolution/e-summary-weather.c:262
+msgid "There was an error downloading data for"
+msgstr "Σφάλμα μεταφόρτωσης δεδομένων για"
+
+#: my-evolution/e-summary-weather.c:480
+msgid "Weather"
+msgstr "Καιρός"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:584
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:198
+msgid "%A, %B %e %Y"
+msgstr "%A, %e %B  %Y"
+
+#: my-evolution/e-summary.c:523
+msgid "Please wait..."
+msgstr "Παρακαλώ περιμένετε..."
+
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Εκτύπωση Περίληψης"
+
+#: my-evolution/e-summary.c:623
+msgid "Printing of Summary failed"
+msgstr "Η Εκτύπωση Περίληψης απέτυχε"
+
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -25687,6 +25823,23 @@ msgstr "_Προγραμματισμός"
 msgid "_Weather"
 msgstr "_Καιρός"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Το περιβάλλον Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Ρυθμίσεις φακέλων"
+
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Εμφάνιση Λεπτομερειών"
@@ -25704,7 +25857,7 @@ msgstr ""
 "Αδύνατη η μεταφορά του φακέλου:\n"
 "%s"
 
-#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:127
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "\"%s\" σε  \"%s\""
@@ -25717,8 +25870,8 @@ msgstr "Προσθήκη ενός φακέλου"
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:466
-#: shell/e-shell-view.c:470 shell/e-shortcuts.c:1082
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
@@ -25730,29 +25883,11 @@ msgstr "Εξερχόμενα"
 msgid "Sent"
 msgstr "Απεσταλμένα"
 
-#: shell/e-setup.c:131
-msgid "Evolution installation"
-msgstr "Εγκατάσταση του Evolution"
-
-#: shell/e-setup.c:135
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Η νέα έκδοση του Evolution πρέπει να εγκαταστήσει συμπληρωματικά αρχεία\n"
-"στον προσωπικό σας κατάλογο Evolution"
-
-#: shell/e-setup.c:136
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Παρακαλώ επιλέξτε \"OK\"για να εγκατασταθούν τα αρχεία ή \"Ακύρωση\" για "
-"έξοδο."
-
-#: shell/e-setup.c:176
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Δεν είναι δυνατή η σωστή ενημέρωση των αρχείων"
 
-#: shell/e-setup.c:199
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -25763,7 +25898,7 @@ msgstr ""
 "%s\n"
 "Σφάλμα: %s"
 
-#: shell/e-setup.c:214
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -25772,40 +25907,7 @@ msgstr ""
 "Συνέβη ένα σφάλμα κατά την αντιγραφεί αρχείων στο\n"
 "`%s'."
 
-#: shell/e-setup.c:287
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Δεν ήταν δυνατή η δημιουργία του καταλόγου\n"
-"%s:\n"
-"%s"
-
-#: shell/e-setup.c:305
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-"Ο κατάλογος %s\n"
-"δεν έχει τις αναγκαίες άδειες. Παρακαλώ δώστε άδεια\n"
-"ανάγνωσης και εκτέλεσης και επανεκκινήστε το Evolution."
-
-#: shell/e-setup.c:311
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-"Το αρχείο %s\n"
-"πρέπει να αφαιρεθεί για να επιτραπεί στο Evolution να δουλέψει σωστά\n"
-"Παρακαλώ αφαιρέστε το αρχείο και επανεκκινήστε το  Evolution."
-
-#: shell/e-setup.c:334
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25816,21 +25918,7 @@ msgstr ""
 "Παρακαλώ να το μεταφέρετε για να συνεχιστεί\n"
 "η εγκατάσταση των αρχείων χρήστη του Evolution."
 
-#: shell/e-setup.c:348
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-"Το Evolution βρήκε έναν παλαιό κατάλογο\n"
-"Εκτελεστικής Σύνοψης \n"
-"Θα πρέπει να αφαιρεθεί πριν \n"
-"το Evolution μπορέσει να εκτελεστεί \n"
-"Θέλετε να αφαιρεθεί αυτός ο κατάλογος;"
-
-#: shell/e-setup.c:373
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25845,49 +25933,6 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Συνεργάστηκαν"
 
-#: shell/e-shell.c:174
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"Αδυναμία ενεργοποίησης στοιχείου%s :\n"
-"Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
-"%s"
-
-#: shell/e-shell.c:754
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Δεν ήταν δυνατή η δημιουργία τοπικής αποθήκευσης -- %s"
-
-#: shell/e-shell.c:1825
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"Το συστατικό του Evolution που διαχειρίζεται του φακέλους τύπου\"%s\"\n"
-"τερματίστηκαν αναπάντεχα. Θα χρειαστεί να τερματίζεται το Evolution και\n"
-"να το ξεκινήσετε πάλι για να έχετε ξανά πρόσβαση στα δεδομένα."
-
-#: shell/e-shell.c:2090
-msgid "Invalid arguments"
-msgstr "Μη έγκυρη παράμετρος"
-
-#: shell/e-shell.c:2092
-msgid "Cannot register on OAF"
-msgstr "Δεν ήταν δυνατή η εγγραφή στο OAF"
-
-#: shell/e-shell.c:2094
-msgid "Configuration Database not found"
-msgstr "Δεν βρέθηκε η βάση δεδομένων ρυθμίσεων"
-
-#: shell/e-shell.c:2096 shell/e-storage.c:576
-msgid "Generic error"
-msgstr "Γενικό σφάλμα"
-
 #: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
@@ -25909,47 +25954,47 @@ msgstr "Χωρίς σύνδεση Φάκελοι"
 msgid "Autocompletion Folders"
 msgstr "Φάκελοι αυτόματης συμπλήρωσης"
 
-#: shell/e-shell-folder-commands.c:141
+#: shell/e-shell-folder-commands.c:140
 #, c-format
 msgid "Cannot copy folder: %s"
 msgstr "Αδυναμία αντιγραφής φακέλου: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, c-format
 msgid "Cannot move folder: %s"
 msgstr "Αδυναμία μετακίνησης φακέλου: %s"
 
-#: shell/e-shell-folder-commands.c:189
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Δεν ήταν δυνατή η μετακίνηση του φακέλου στον εαυτό του."
 
-#: shell/e-shell-folder-commands.c:191
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Δεν είναι δυνατό να αντιγραφεί ο φάκελος στον εαυτό του."
 
-#: shell/e-shell-folder-commands.c:205
+#: shell/e-shell-folder-commands.c:204
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Αδύνατη η μετακίνηση φακέλου σε ένα από τους θυγατρικούς του."
 
-#: shell/e-shell-folder-commands.c:320
+#: shell/e-shell-folder-commands.c:319
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Επιλέξτε έναν φάκελο για να αντιγραφεί ο φάκελος \"%s\":"
 
-#: shell/e-shell-folder-commands.c:324
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Αντιγραφή φακέλου"
 
-#: shell/e-shell-folder-commands.c:364
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Επιλέξτε έναν φάκελο για να μεταφερθεί ο φάκελος \"%s\":"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Μετακίνηση φακέλου"
 
-#: shell/e-shell-folder-commands.c:392
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25958,17 +26003,17 @@ msgstr ""
 "Δεν ήταν δυνατή η διαγραφή του φακέλου:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:402
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Διαγραφή \"%s\""
-
-#: shell/e-shell-folder-commands.c:403
+#: shell/e-shell-folder-commands.c:405
 #, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Αλήθεια να γίνει διαγραφή του φακέλου \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:483
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Διαγραφή \"%s\""
+
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25977,26 +26022,26 @@ msgstr ""
 "Δεν ήταν δυνατή η μετονομασία του φακέλου :\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:532
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Μετονομασία φακέλου \"%s\" σε:"
 
-#: shell/e-shell-folder-commands.c:538
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Μετονομασία φακέλου"
 
-#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-commands.c:549
 #: shell/e-shell-folder-creation-dialog.c:170
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Το συγκεκριμένο όνομα φακέλου δεν είναι έγκυρο: %s"
 
-#: shell/e-shell-folder-commands.c:581
+#: shell/e-shell-folder-commands.c:583
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:586
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -26014,11 +26059,11 @@ msgstr ""
 "Δεν ήταν δυνατή η δημιουργία του συγκεκριμένου φακέλου:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:292
+#: shell/e-shell-folder-creation-dialog.c:308
 msgid "Create New Folder"
 msgstr "Δημιουργία Νέου Φακέλου.."
 
-#: shell/e-shell-folder-title-bar.c:654 shell/e-shell-folder-title-bar.c:655
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Χωρίς Τίτλο)"
 
@@ -26040,7 +26085,7 @@ msgstr ""
 "Μπορείτε να επιλέξτε \"Αυτόματη\" αν δεν ξέρετε, και το Evolution θα "
 "δοκιμάσει να βρει την λίστα."
 
-#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:816
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Παρακαλώ επιλέξτε την πληροφορία που θέλετε να εισάγετε:"
 
@@ -26053,21 +26098,21 @@ msgstr ""
 "Εισάγεται το %s\n"
 "Εισάγεται το στοιχείο%d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:351
 msgid "Select importer"
 msgstr "Επιλογή εισαγωγής"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "Το αρχείο %s δεν υπάρχει"
 
-#: shell/e-shell-importer.c:491 shell/e-shell-importer.c:508
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:552
 msgid "Evolution Error"
 msgstr "Σφάλμα Evolution"
 
-#: shell/e-shell-importer.c:507
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -26076,11 +26121,11 @@ msgstr ""
 "Δεν υπάρχει εισαγωγέας που να μπορεί να χειριστεί το\n"
 "%s"
 
-#: shell/e-shell-importer.c:516
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Εισάγεται"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26089,17 +26134,17 @@ msgstr ""
 "Εισάγεται το %s.\n"
 "Ξεκίνα το %s"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Σφάλμα κατά την εκκίνηση του %s"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Σφάλμα κατά το φόρτωμα του %s"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26108,31 +26153,31 @@ msgstr ""
 "Εισάγεται το %s\n"
 "Εισάγεται το στοιχείο 1."
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Αυτόματη"
 
-#: shell/e-shell-importer.c:674
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Όνομα Αρχείου:"
 
-#: shell/e-shell-importer.c:679
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Επιλέξτε ένα αρχείο"
 
-#: shell/e-shell-importer.c:688
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Τύπος αρχείου:"
 
-#: shell/e-shell-importer.c:713
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Εισαγωγή δεδομένων και ρυθμίσεις από παλαιότερα προγράμματα"
 
-#: shell/e-shell-importer.c:717
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Εισαγωγή μοναδικού αρχείου"
 
-#: shell/e-shell-importer.c:783 shell/e-shell-startup-wizard.c:642
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -26140,32 +26185,32 @@ msgstr ""
 "Παρακαλώ περιμένετε...\n"
 "Γίνεται σάρωση για υπάρχουσες εγκαταστάσεις"
 
-#: shell/e-shell-importer.c:786 shell/e-shell-startup-wizard.c:645
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Εκκίνηση των Έξυπνων Εισαγωγέων"
 
-#: shell/e-shell-importer.c:910 shell/e-shell-startup-wizard.c:770
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Από %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Επιλογή Φακέλου"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Επιλέξτε έναν φάκελο προορισμού για την εισαγωγή αυτών των δεδομένων"
 
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:191
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: shell/e-shell-offline-handler.c:588
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Κλείσιμο συνδέσεων..."
 
-#: shell/e-shell-offline-sync.c:160
+#: shell/e-shell-offline-sync.c:163
 #, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -26174,62 +26219,54 @@ msgstr ""
 "Σφάλμα συγχρονισμού \"%s\":\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:238
+#: shell/e-shell-offline-sync.c:232
 msgid "Syncing Folder"
 msgstr "Συγχρονισμός φακέλου"
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:315
+#: shell/e-shell-offline-sync.c:311
 #, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Συγχρονισμός \"%s\" (%d από %d) ..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr "Ρυθμίσεις Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:352
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+#, fuzzy
+msgid "Please select a user."
+msgstr "Παρακαλώ επιλέξτε διακομιστή."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 msgid "Opening Folder"
 msgstr "Άνοιγμα φακέλου"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:359
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Άνοιγμα φακέλου \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, c-format
 msgid "in \"%s\" ..."
 msgstr "σε \"%s\" ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:444
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Δεν ήταν δυνατό το άνοιγμα κοινόχρηστου φακέλου : %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:497
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 msgid "Cannot find the specified shared folder."
 msgstr "Δεν ήταν δυνατή η εύρεση του συγκεκριμένου κοινόχρηστου φακέλου."
 
-#: shell/e-shell-startup-wizard.c:156
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Δεν είναι δυνατή η αρχικοποίηση της διεπαφής του Βοηθού Ταχυδρομείου του "
-"Evolution\n"
-"(%s)"
-
-#: shell/e-shell-startup-wizard.c:167
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr ""
-"Δεν είναι δυνατή η αρχικοποίηση της διεπαφής του Βοηθού Ταχυδρομείου του "
-"Evolution\n"
-
 #: shell/e-shell-user-creatable-items-handler.c:582
 #: shell/e-shell-user-creatable-items-handler.c:636
-#: widgets/misc/e-charset-picker.c:105
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr "Νέο"
 
@@ -26242,286 +26279,330 @@ msgid "Folder name cannot contain the Return character."
 msgstr "Ο φάκελος δεν είναι δυνατό να περιέχει το πλήκτρο Επιστροφής."
 
 #: shell/e-shell-utils.c:129
-msgid "Folder name cannot contain slashes."
-msgstr "Το όνομα του φακέλου δεν μπορεί να περιέχει κάθετους."
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Ο φάκελος δεν είναι δυνατό να περιέχει το πλήκτρο Επιστροφής."
 
 #: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Ο φάκελος δεν είναι δυνατό να περιέχει το πλήκτρο Επιστροφής."
+
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "το '.' and '..' είναι κρατημένα ονόματα φακέλων."
 
-#: shell/e-shell-view.c:233
-msgid "(No folder displayed)"
-msgstr "(Δεν εμφανίζεται φάκελος)"
-
-#: shell/e-shell-view.c:1995
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:1997
-msgid "(None)"
-msgstr "(Κενό)"
-
-#: shell/e-shell-view.c:2040
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Το Ximian Evolution είναι συνδεμένο στο δίκτυο. Κάντε κλικ στο πλήκτρο για "
-"να αποσυνδεθείτε."
-
-#: shell/e-shell-view.c:2047
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Το Ximian Evolution είναι στην διαδικασία αποσύνδεσης από το δίκτυο."
-
-#: shell/e-shell-view.c:2053
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Το Ximian Evolution είναι εκτός δικτύου. Κάντε κλικ στο πλήκτρο για να "
-"συνδεθείτε."
-
-#: shell/e-shell-view-menu.c:91
+#: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Τα εργαλεία GNOME Pilot φαίνεται να μην είναι εγκατεστημένα σ' αυτό το "
 "σύστημα."
 
-#: shell/e-shell-view-menu.c:99
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr "Σφάλμα κατά την εκτέλεση του%s."
 
-#: shell/e-shell-view-menu.c:195
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Το Bug buddy δεν βρέθηκε στο $PATH σας."
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "Δεν ήταν δυνατή η εκτέλεση του Bug buddy"
 
-#: shell/e-shell-view-menu.c:203
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "Δεν ήταν δυνατή η εκτέλεση του Bug buddy"
 
-#: shell/e-shell-view-menu.c:249
+#: shell/e-shell-view-menu.c:247
 msgid "About Ximian Evolution"
 msgstr "Περί του Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "Μετάβαση στο φάκελο..."
 
-#: shell/e-shell-view-menu.c:505
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr "Επιλέξτε τον φάκελο που θέλετε να ανοίξετε"
 
-#: shell/e-shell-view-menu.c:619
+#: shell/e-shell-view-menu.c:617
 msgid "Create New Shortcut"
 msgstr "Δημιουργία νέας συντόμευσης"
 
-#: shell/e-shell-view-menu.c:620
+#: shell/e-shell-view-menu.c:618
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Επιλέξτε τον φάκελο που θα συνδεθεί με την συντόμευση:"
 
-#: shell/e-shell-view-menu.c:778
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "Εργασία ε_ντός Δικτύου"
 
-#: shell/e-shell-view-menu.c:791 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr "Εργασία ε_κτός Δικτύου"
 
-#: shell/e-shell-view-menu.c:804 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr "Χρήση Χωρίς Σύνδεση"
 
-#: shell/e-shortcuts.c:647
-msgid "Error saving shortcuts."
-msgstr "Σφάλμα κατά την αποθήκευση των συντομεύσεων."
+#: shell/e-shell-view.c:262
+msgid "(No folder displayed)"
+msgstr "(Δεν εμφανίζεται φάκελος)"
 
-#: shell/e-shortcuts.c:1094
-msgid "Shortcuts"
-msgstr "Συντομεύσεις"
+#: shell/e-shell-view.c:2045
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2047
+msgid "(None)"
+msgstr "(Κενό)"
+
+#: shell/e-shell-view.c:2091
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Το Ximian Evolution είναι συνδεμένο στο δίκτυο. Κάντε κλικ στο πλήκτρο για "
+"να αποσυνδεθείτε."
+
+#: shell/e-shell-view.c:2098
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Το Ximian Evolution είναι στην διαδικασία αποσύνδεσης από το δίκτυο."
+
+#: shell/e-shell-view.c:2104
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Το Ximian Evolution είναι εκτός δικτύου. Κάντε κλικ στο πλήκτρο για να "
+"συνδεθείτε."
+
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"Αδυναμία ενεργοποίησης στοιχείου%s :\n"
+"Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Δεν ήταν δυνατή η δημιουργία τοπικής αποθήκευσης -- %s"
+
+#: shell/e-shell.c:1802
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"Το συστατικό του Evolution που διαχειρίζεται του φακέλους τύπου\"%s\"\n"
+"τερματίστηκαν αναπάντεχα. Θα χρειαστεί να τερματίζεται το Evolution και\n"
+"να το ξεκινήσετε πάλι για να έχετε ξανά πρόσβαση στα δεδομένα."
+
+#: shell/e-shell.c:2067
+msgid "Invalid arguments"
+msgstr "Μη έγκυρη παράμετρος"
+
+#: shell/e-shell.c:2069
+msgid "Cannot register on OAF"
+msgstr "Δεν ήταν δυνατή η εγγραφή στο OAF"
 
-#: shell/e-shortcuts-view.c:79
+#: shell/e-shell.c:2071
+msgid "Configuration Database not found"
+msgstr "Δεν βρέθηκε η βάση δεδομένων ρυθμίσεων"
+
+#: shell/e-shell.c:2073 shell/e-storage.c:572
+msgid "Generic error"
+msgstr "Γενικό σφάλμα"
+
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "Δημιουργία νέας ομάδας συντομεύσεως"
 
-#: shell/e-shortcuts-view.c:80
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Όνομα ομάδας:"
 
-#: shell/e-shortcuts-view.c:174
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
+#: shell/e-shortcuts-view.c:179
+#, fuzzy, c-format
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
 msgstr ""
 "Είστε βέβαιοι για την αφαίρεση της ομάδας\n"
 "`%s' από την γραμμή συντομεύσεων;"
 
-#: shell/e-shortcuts-view.c:179
-msgid "Don't remove"
-msgstr "Να μην αφαιρεθεί"
-
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Μετονομασία Ομάδα Συντόμευσης"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Μετονομασία της επιλεγμένης ομάδας συντομεύσεων σε:"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "Μικρά Εικονίδια"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Εμφάνιση των συντομεύσεων ως μικρά εικονίδια"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "Μεγάλα Εικονίδια"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Εμφάνιση των συντομεύσεων ως μεγάλα εικονίδια"
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_Νέα Ομάδα..."
 
-#: shell/e-shortcuts-view.c:258
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Δημιουργία νέας ομάδας συντομεύσεων"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "_Αφαίρεση αυτής της Ομάδας..."
 
-#: shell/e-shortcuts-view.c:261
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Αφαίρεση αυτής της ομάδας συντομεύσεων"
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "_Μετονομασία της Ομάδας..."
 
-#: shell/e-shortcuts-view.c:264
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Μετονομασία ομάδας συντομεύσεων"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "Α_πόκρυψη γραμμής συντομεύσεων"
 
-#: shell/e-shortcuts-view.c:270
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Απόκρυψη γραμμής συντομεύσεων"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:281
 msgid "Create _Default Shortcuts"
 msgstr "Δημιουργία ε_ξ ορισμού συντομεύσεων"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:282
 msgid "Create Default Shortcuts"
 msgstr "Δημιουργία εξ ορισμού συντομεύσεων"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Μετονομασία συντόμευσης"
 
-#: shell/e-shortcuts-view.c:396
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Μετονομασία επιλεγμένης συντόμευσης σε:"
 
-#: shell/e-shortcuts-view.c:409
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Άνοιγμα του φακέλου συνδεμένο με αυτή την συντόμευση"
 
-#: shell/e-shortcuts-view.c:411 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Άνοιγμα σε _Νέο Παράθυρο"
 
-#: shell/e-shortcuts-view.c:411
+#: shell/e-shortcuts-view.c:417
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Άνοιγμα του φακέλου συνδεμένο με αυτή την συντόμευση σε νέο παράθυρο"
 
-#: shell/e-shortcuts-view.c:414
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: shell/e-shortcuts-view.c:414
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Μετονομασία Συντόμευσης"
 
-#: shell/e-shortcuts-view.c:416
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "_Αφαίρεση"
 
-#: shell/e-shortcuts-view.c:416
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Αφαίρεση αυτής της συντόμευσης από την γραμμή συντομεύσεων"
 
-#: shell/e-storage.c:574
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Σφάλμα κατά την αποθήκευση των συντομεύσεων."
+
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Συντομεύσεις"
+
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Checkbox"
+
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Χωρίς σφάλμα"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Υπάρχει ήδη φάκελος με αυτό το όνομα"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Ο καθορισμένος τύπος φακέλου δεν είναι έγκυρος"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "Σφάλμα Ι/Ο"
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Δεν υπάρχει αρκετός χώρος για την δημιουργία του φακέλου"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "Ο φάκελος δεν είναι άδειος"
 
-#: shell/e-storage.c:588
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "Ο καθορισμένος φάκελος δεν βρέθηκε"
 
-#: shell/e-storage.c:590
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr " Η λειτουργία αύτη δεν έχει ενσωματωθεί σε αυτή την αποθήκη"
 
-#: shell/e-storage.c:594
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Η λειτουργία δεν υποστηρίζεται"
 
-#: shell/e-storage.c:596
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr ""
 "Δεν υπάρχει υποστηρίξει για τον συγκεκριμένο τύπο σε αυτή τη αποθήκευση"
 
-#: shell/e-storage.c:598
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 "Δεν είναι δυνατό να μετονομαστεί η να μετακινηθεί ο συγκεκριμένος φάκελος "
 
-#: shell/e-storage.c:600
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:602
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr "Δεν ήταν δυνατή η δημιουργία φακέλου με αυτό το όνομα"
 
-#: shell/e-storage.c:604
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Checkbox"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -26532,130 +26613,122 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% έχει ολοκληρωθεί)"
 
-#: shell/evolution-folder-selector-button.c:101
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<κάντε κλικ εδώ για να επιλέξετε φάκελο>"
 
-#: shell/evolution-shell-component.c:1154
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Άγνωστο Σφάλμα."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Το σφάλμα από το σύστημα συστατικών είναι:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "Σφάλμα CORBA"
 
-#: shell/evolution-shell-component.c:1156
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Έγινε Διακοπή"
 
-#: shell/evolution-shell-component.c:1158
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Μη έγκυρη παράμετρος"
 
-#: shell/evolution-shell-component.c:1160
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Έχει ήδη ιδιοκτήτη"
 
-#: shell/evolution-shell-component.c:1162
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Χωρίς ιδιοκτήτη"
 
-#: shell/evolution-shell-component.c:1164
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Δεν βρέθηκε"
 
-#: shell/evolution-shell-component.c:1166
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Ο τύπος δεν υποστηρίζεται"
 
-#: shell/evolution-shell-component.c:1168
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Μη υποστηριζόμενο σχήμα"
 
-#: shell/evolution-shell-component.c:1170
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Η λειτουργία δεν υποστηρίζεται"
 
-#: shell/evolution-shell-component.c:1172
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Εσωτερικό σφάλμα"
 
-#: shell/evolution-shell-component.c:1176
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Τερματίζει"
 
-#: shell/evolution-shell-component.c:1178
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Μη έγκυρο URI"
 
-#: shell/evolution-shell-component.c:1182
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Έχει υποφακέλους"
 
-#: shell/evolution-shell-component.c:1184
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Δεν έχει μείνει ελεύθερος χώρος"
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Ο παλαιός ιδιοκτήτης έχει πεθάνει"
 
-#: shell/evolution-shell-component-utils.c:123
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Άγνωστο Σφάλμα."
-
-#: shell/evolution-shell-component-utils.c:126
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Το σφάλμα από το σύστημα συστατικών είναι:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:133
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
-"%s"
-
-#: shell/evolution-test-component.c:62
+#: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Τύπος δοκιμής:"
 
-#: shell/evolution-test-component.c:702
+#: shell/evolution-test-component.c:703
 msgid "Evolution Test Component"
 msgstr "Στοιχείο δοκιμής του Evolution."
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Ενεργές συνδέσεις"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Κάντε κλικ στο ΟΚ για να κλείσετε τις συνδέσεις και να δουλέψετε εκτός "
 "δικτύου"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Σύστημα"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr "Οι παρακάτω συνδέσεις είναι ενεργές αυτή τη στιγμή:"
 
@@ -26703,29 +26776,30 @@ msgstr "Όνομα _Φακέλου:"
 msgid "_User:"
 msgstr "_ Χρήστης:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Βοηθός Εγκατάστασης του Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Γίνεται Εισαγωγή Αρχείων"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Ζώνη αλλαγής ώρας:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Καλώς Ορίσατε"
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
+#, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 "Καλώς ορίσατε στο Evolution. Οι λιγοστές οθόνες που ακολουθούν\n"
 "θα επιτρέψουν στο Evolution να συνδεθεί στους λογαριασμούς ηλεκτρονικού\n"
@@ -26733,39 +26807,19 @@ msgstr ""
 "\n"
 "Παρακαλώ επιλέξτε το πλήκτρο \"Επόμενο\" για την συνέχεια. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
+#, fuzzy
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 "Έχετε εισάγει με επιτυχία όλες τις πληροφορίες\n"
 "που χρειάζεται το Evolution. \n"
 "\n"
 "Επιλέξτε \"Τερματισμός\" για να αποθηκεύσετε τις ρυθμίσεις. "
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
-msgid "Configuration control for Evolution folder settings."
-msgstr "Εργοστάσιο για τον επεξεργαστή του Evolution."
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
-msgstr "Ρυθμίσεις φακέλων"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "Το περιβάλλον Evolution."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -26819,25 +26873,26 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 "Δεν ήταν δυνατό για το Evolution να εισάγει δεδομένα από τα παρακάτω αρχεία:"
 
-#: shell/main.c:104 shell/main.c:474
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:110
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Το Evolution τώρα τερματίζεται..."
 
-#: shell/main.c:209
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:266
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -26847,7 +26902,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:230
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26855,67 +26910,105 @@ msgstr ""
 "Ευχαριστούμε\n"
 "Η ομάδα του Ximian Evolution\n"
 
-#: shell/main.c:238
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "Να μην ξαναγίνει η ερώτηση"
 
-#: shell/main.c:357
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Δεν ήταν δυνατή η πρόσβαση στο περιβάλλον του Ximian Evolution."
 
-#: shell/main.c:366
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 "Δεν ήταν δυνατή η αρχικοποίηση του περιβάλλοντος του Ximian Evolution: %s"
 
-#: shell/main.c:446
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Απενεργοποίηση οθόνης χαιρετισμού"
 
-#: shell/main.c:448
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Εκκίνηση σε λειτουργία χωρίς σύνδεση"
 
-#: shell/main.c:450
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Εκκίνηση σε λειτουργία με σύνδεση"
 
-#: shell/main.c:452
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr ""
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
 
-#: shell/main.c:454
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:478
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: tools/evolution-addressbook-abuse.c:80
-#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-abuse.c:81
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Σφάλμα κατά την φόρτωση του βιβλίου διευθύνσεων."
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Εισαγωγή Αρχείου"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Εξαγωγή Αρχείου"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Δεν έχετε δώσει όνομα αρχείου."
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Προσθήκη συννημένου..."
+
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:327
+#, fuzzy
+msgid "Description of the attachment."
+msgstr "Η περιγραφή περιέχει"
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:329
+msgid "Default subject for the message."
+msgstr ""
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "Δεν ήταν δυνατή η μετονομασία '%s': %s"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Αντιγραφή επαφών σε άλλο φάκελο..."
@@ -27002,9 +27095,9 @@ msgstr "Προβολή της τρέχουσας επαφής"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:93 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr "Ε_νέργειες"
 
@@ -27122,7 +27215,7 @@ msgid "Print this item"
 msgstr "Εκτύπωση αυτού του στοιχείου"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:152
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "Αποθήκευση"
 
@@ -27149,7 +27242,7 @@ msgstr "Αποθήκευσης αυτού του στοιχείου στον δ�
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Αρχείο"
 
@@ -27402,7 +27495,7 @@ msgstr "Λίστα μηνυμάτων κατά θέμα"
 msgid "_Expunge"
 msgstr "_Εξάλειψη"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Φάκελος"
 
@@ -27418,22 +27511,6 @@ msgstr "_Ιδιότητες..."
 msgid "_Threaded Message List"
 msgstr "Λίστα μηνυμάτων κατά _θέμα"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Κλείσιμο του παραθύρου"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
-msgid "_Close"
-msgstr "_Κλείσιμο"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
-msgid "_View"
-msgstr "_Προβολή"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Προσ_θήκη Αποστολέα στο Βιβλίο Διευθύνσεων"
@@ -27829,7 +27906,7 @@ msgstr "Σε παρά_θεση"
 msgid "_Resend..."
 msgstr "_Αποστολή ξανά..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Εργαλεία"
 
@@ -27837,6 +27914,22 @@ msgstr "_Εργαλεία"
 msgid "_Undelete"
 msgstr "Α_ναίρεση Διαγραφής"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Κλείσιμο του παραθύρου"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:44
+msgid "_Close"
+msgstr "_Κλείσιμο"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Προβολή"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Επισύναψη"
@@ -28013,7 +28106,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Αποθήκευση αυτού του αρχείου και κλείσιμο του παραθύρου"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr "_Βοήθεια"
 
@@ -28190,124 +28283,115 @@ msgid "Pi_lot Settings..."
 msgstr "Ρυθμίσεις Pi_lot ..."
 
 #: ui/evolution.xml.h:27
-msgid "Pilot Con_duit Settings..."
-msgstr "Ρυθμίσεις Pilot Con_duit..."
-
-#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Δημιουργία _Νέου Φακέλου.."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Αποστολή / Λήψη"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Send queued items and retrieve new items"
 msgstr "Αποστολή μηνυμάτων σε αναμονή και λήψη νέων"
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "Ρυθμίσεις Ταχυδρομείου"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Set up Pilot configuration"
 msgstr "Ρύθμιση Pilot "
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Εμφάνιση πληροφοριών σχετικά με το Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Στείλτε Αναφορά Προβλήματος"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "Στείλτε _Αναφορά Προβλήματος"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Δηλώστε ένα πρόβλημα με χρήση του Bug Buddy"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Εναλλαγή"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Εναλλαγή της εμφάνισης της γραμμής συντομεύσεων"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Εναλλαγή της εμφάνισης της γραμμής συντομεύσεων"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Εναλλαγή της σύνδεσης στο δίκτυο."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Προβολή επιλεγμένου φακέλου"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "Συχνές ερωτήσεις για το Evolution"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "_Περί του Ximian Evolution..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Αντιγραφή..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Γραμμή Φακέλων"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Folder..."
 msgstr "_Φάκελος..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "_Μετάβαση στον Φάκελο..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "_Εισαγωγή..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Μετακίνηση..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Νέο"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "Νέος _Φάκελος"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 msgid "_Remove Other User's Folder"
 msgstr "Α_πομάκρυνση φακέλων άλλων χρηστών"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Μετονομασία..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Αποστολή / Λήψη"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "_Γραμμή Συντομεύσεων"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr "_Συντόμευση..."
 
@@ -28383,9 +28467,8 @@ msgstr "Με _Κατηγορία"
 msgid "_Tasks"
 msgstr "_Εργασίες"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:201
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:688
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr "UTC"
 
@@ -28411,43 +28494,43 @@ msgstr ""
 "περιοχή στον χάρτη και επιλέξτε μια ζώνη αλλαγής ώρας:\n"
 "Με το δεξί πλήκτρο του ποντικιού κάνετε σμίκρυνση του χάρτη."
 
-#: widgets/menus/gal-view-menus.c:287
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "_Τρέχουσα Προβολή"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:349
+#: widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Προσαρμοσμένη Προβολή"
 
-#: widgets/menus/gal-view-menus.c:358
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr "Αποθήκευση προσαρμοσμένης προβολής"
 
-#: widgets/menus/gal-view-menus.c:371
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "Καθορισμός Προβολών"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:423
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "ΔΤΤΠΠΣΚ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1069
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "Τώρα"
 
-#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr "Σήμερα"
 
-#: widgets/misc/e-cell-date-edit.c:802
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ο χρόνος πρέπει να έχει την μορφή: %s"
@@ -28456,80 +28539,80 @@ msgstr "Ο χρόνος πρέπει να έχει την μορφή: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Η ποσοστιαία μονάδα πρέπει να είναι μεταξύ 0 και 100, υποχρεωτικά"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Βαλτικά"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Κεντρικής Ευρώπης"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Κινέζικα"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Κυριλλικά"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr "Εβραϊκά"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Γιαπωνέζικα"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Κορεάτικα"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Τουρκικά"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "Δυτικής Ευρώπης"
 
-#: widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Παραδοσιακά"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr "Απλοποιημένα"
 
-#: widgets/misc/e-charset-picker.c:93
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ουκρανικά"
 
-#: widgets/misc/e-charset-picker.c:96
+#: widgets/misc/e-charset-picker.c:97
 msgid "Visual"
 msgstr "Οπτική"
 
-#: widgets/misc/e-charset-picker.c:165
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Άγνωστο σύνολο χαρακτήρων: %s"
 
-#: widgets/misc/e-charset-picker.c:207
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Εισάγετε την κωδικοποίηση προς χρήση"
 
-#: widgets/misc/e-charset-picker.c:282
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Άλλο..."
 
-#: widgets/misc/e-charset-picker.c:402
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Κωδικοποίηση Χαρακτήρων"
 
@@ -28537,11 +28620,12 @@ msgstr "Κωδικοποίηση Χαρακτήρων"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:187
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Επεξεργαστής Αναζήτησης"
 
-#: widgets/misc/e-filter-bar.c:209
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Αποθήκευση Αναζήτησης"
 
@@ -28573,43 +28657,522 @@ msgstr "Ερώτηση"
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Αναζήτηση"
+
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr "Εύ_ρεση Τώρα"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 msgid "_Clear"
 msgstr "_Καθαρισμός"
 
-#: widgets/misc/e-search-bar.c:823
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr "Ταυτότητα αντικειμένου"
 
-#: widgets/misc/e-search-bar.c:830
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr "Ταυτότητα υποαντικειμένου"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:847
 msgid "Text"
 msgstr "Κείμενο"
 
-#: widgets/misc/e-search-bar.c:915
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Καθαρισμός"
 
-#: widgets/misc/e-search-bar.c:917
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Εύρεση Τώρα"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Ο διακομιστής προσωπικού βιβλίου διευθύνσεων"
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
 #: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Ο Προσωπικός Εξυπηρετητής Ημερολογίου, Εργοστάσιο Ημερολογίου"
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Προβολή iTip/iMip ημερολογίου Evolution"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Εργοστάσιο για την εισαγωγή αρχείων LDIF στο Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Εισάγει αρχεία LDIF στο Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Εργοστάσιο για την εισαγωγή αρχείων VCard στο Evolution"
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Εισαγωγή αρχείων VCard στο Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Στοιχείο ελέγχου του Bonobo για την ανάδυση μιας διεύθυνσης."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Στοιχείο ελέγχου του Bonobo για την προβολή μιας διεύθυνσης."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Δείγμα ελέγχου Bonobo για την προβολή ενός Βιβλίου Διευθύνσεων"
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr ""
+#~ "Έλεγχος Ρυθμίσεων για τις αποθήκες του Ευρετηρίου Διευθύνσεων του "
+#~ "Evolution."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr ""
+#~ "Στοιχείο ελέγχου για την προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του "
+#~ "Evolution."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Στοιχείο του Evolution για τη διαχείριση των επαφών."
+
+#~ msgid "Factory for the controls exported by the Evolution Addressbook"
+#~ msgstr ""
+#~ "Εργοστάσιο για τους ελέγχους που εξάγονται από το Ευρετήριο διευθύνσεων "
+#~ "του Evolution"
+
+#~ msgid "1234"
+#~ msgstr "1234"
+
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "666"
+#~ msgstr "666"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<- _Απομάκρυνση"
+
+#~ msgid "<< Fewer Options"
+#~ msgstr "<< Λιγότερες επιλογές"
+
+#~ msgid "Add (or Edit) Attribute Mappings"
+#~ msgstr "Προσθήκη (ή Επεξεργασία) χαρτογραφήσεων γνωρισμάτων"
+
+#~ msgid "DN Customization"
+#~ msgstr "Προσαρμογή DN"
+
+#~ msgid "Mappings"
+#~ msgstr "Χαρτογραφήσεις"
+
+#~ msgid "Objectclasses"
+#~ msgstr "Objectclasses"
+
+#~ msgid "Objectclasses Used in Evolution:"
+#~ msgstr "Objectclasses που χρησιμοποιούνται στο Evolution:"
+
+#~ msgid "Objectclasses Used on Server:"
+#~ msgstr "Objectclasses που χρησιμοποιούνται στον διακομιστή:"
+
+#~ msgid ""
+#~ "Please select an Evolution attribute and an\n"
+#~ "LDAP attribute to associate with it."
+#~ msgstr ""
+#~ "Παρακαλώ επιλέξτε ένα γνώρισμα του Evolution  και ένα\n"
+#~ "γνώρισμα LDAP για να το συσχετίσετε."
+
+#~ msgid "R_estore Defaults"
+#~ msgstr "_Επαναφορά Εξ' ορισμού"
+
+#~ msgid "Re_store Defaults"
+#~ msgstr "Ε_παναφορά Εξ' ορισμού"
+
+#~ msgid ""
+#~ "To add an attribute to the DN, select it from the list and click the "
+#~ "\"Add Attribute\" button.\n"
+#~ "Any values that you add to the DN will become required values for any new "
+#~ "contacts\n"
+#~ "that you add to the directory on the LDAP server. "
+#~ msgstr ""
+#~ "Για να προσθέσετε ένα γνώρισμα στο DN, επιλέξτε το από την λίστα και "
+#~ "πατήστε το κουμπί \"Προσθήκη Γνωρίσματος\".\n"
+#~ "Όποιες τιμές προσθέσετε στο DN θα γίνουν απαιτούμενες τιμές για όλες τις "
+#~ "νέες επαφές που θα\n"
+#~ "προσθέσετε στον κατάλογο του διακομιστή LDAP."
+
+#~ msgid "_Add ->"
+#~ msgstr "_Προσθήκη ->"
+
+#~ msgid "_Add Mapping"
+#~ msgstr "Προσθήκη χαρτογράφησης"
+
+#~ msgid "_Add to DN"
+#~ msgstr "Προσ_θήκη στο  DN"
+
+#~ msgid "_Always"
+#~ msgstr "_Πάντοτε"
+
+#~ msgid "_Delete Mapping"
+#~ msgstr "_Διαγραφή χαρτογράφησης"
+
+#~ msgid "_Distinguished Name (DN):"
+#~ msgstr "_Διακεκριμένο Όνομα (DN):"
+
+#~ msgid "_Don't use SSL/TLS"
+#~ msgstr "Να μη _γίνεται χρήση SSL/TLS"
+
+#~ msgid "_Edit Mapping"
+#~ msgstr "_Επεξεργασία χαρτογράφησης"
+
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Γνώρισμα _Evolution"
+
+#~ msgid "_If necessary "
+#~ msgstr "Α_ν είναι αναγκαίο"
+
+#~ msgid "_LDAP attribute:"
+#~ msgstr "Γνώρισμα _LDAP:"
+
+#~ msgid "_LDAP attributes:"
+#~ msgstr "Γνωρίσματα _LDAP:"
+
+#~ msgid "_More Options >>"
+#~ msgstr "_Περισσότερες επιλογές >>"
+
+#~ msgid "_Restore Defaults"
+#~ msgstr "Επανα_φορά Εξ' ορισμού"
+
+#~ msgid "account-druid"
+#~ msgstr "οδηγός-λογαριασμού"
+
+#~ msgid "account-editor"
+#~ msgstr "επεξεργαστής-λογαριασμού"
+
+#~ msgid "dn-customization-tab"
+#~ msgstr "dn-customization-tab"
+
+#~ msgid "edit_server_window_simple"
+#~ msgstr "edit_server_window_simple"
+
+#~ msgid "mappings-tab"
+#~ msgstr "mappings-tab"
+
+#~ msgid "objectclasses-tab"
+#~ msgstr "objectclasses-tab"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Επεξεργασία Λίστας Επαφών"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Λίστα Επαφών Χωρίς Τίτλο"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d δεν εμφανίζεται)"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr ""
+#~ "Εργοστάσιο για τη διασύνδεση επιλογής ονομάτων του Βιβλίου Διευθύνσεων"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Υπηρεσία υπενθύμισης ειδοποίησης"
+
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders.  You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "Το Evolution δεν υποστηρίζει ακόμα αυτού του είδους υπενθυμίσεις.  Δεν θα "
+#~ "μπορέσετε να επεξεργαστείτε τις επιλογές για αυτή την ειδοποίηση."
+
+#~ msgid "st"
+#~ msgstr "η"
+
+#~ msgid "nd"
+#~ msgstr "η"
+
+#~ msgid "rd"
+#~ msgstr "η"
+
+#~ msgid "th"
+#~ msgstr "η"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Μηχανισμός ελέγχου του Bonobo για την εμφάνιση λίστας εργασιών."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Ένα παράδειγμα μηχανισμού ελέγχου για την εμφάνιση ημερολογίου."
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Έλεγχος ρυθμίσεων για το Ημερολόγιο του Evolution."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Συστατικό του Evolution για τον έλεγχο του ημερολογίου."
+
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Εργοστάσιο για τα αντικείμενα του Ημερολογίου του Evolution"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr ""
+#~ "Εργοστάσιο για την συγκέντρωση του συστατικού διαλόγου του ημερολογίου"
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Το Evolution πήρε τις εργασίες που ήταν στον φάκελο του ημερολογίου και "
+#~ "τις ενσωμάτωσε αυτόματα στο νέο φάκελο εργασιών."
+
+#~ msgid ""
+#~ "Evolution has tried to take the tasks that were in your calendar folder "
+#~ "and migrate them to the new tasks folder.\n"
+#~ "Some of the tasks could not be migrated, so this process may be attempted "
+#~ "again in the future."
+#~ msgstr ""
+#~ "Το Evolution προσπάθησε να πάρει τις εργασίες που ήταν στον φάκελο του "
+#~ "ημερολογίου και να τις ενσωμάτωσε αυτόματα στον νέο φάκελο εργασιών.\n"
+#~ "Ορισμένες εργασίες δεν ενσωματώθηκαν, έτσι η διαδικασία αυτή μπορεί να "
+#~ "επαναληφθεί στο μέλλον."
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "Δεν ήταν δυνατό να ανοιχθεί το `%s' κανένα από τα στοιχεία του "
+#~ "ημερολογίου δεν θα ενσωματωθεί στον φάκελο εργασιών"
+
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "Η μέθοδος που χρειάζεται για να φορτωθεί το`%s' δεν υποστηρίζεται κανένα "
+#~ "από τα στοιχεία του φακέλου ημερολογίου δεν θα ενσωματωθεί στον φάκελο "
+#~ "εργασιών."
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Εργοστάσιο για την εισαγωγή αρχείων iCalendar  στο Evolution"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Εισάγει αρχεία  iCalendar στο Evolution."
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Εισάγει αρχεία vCalendar στο Evolution."
+
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr "Δεν είναι δυνατή η λήψη λίστας αποθήκης από το μητρώο: %s"
+
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Δεν είναι δυνατή η λήψη getFolderAtPath με την αποθήκη: %s"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Δεν ήταν δυνατή η ενεργοποίηση του παραθύρου του επεξεργαστή επειδή\n"
+#~ "δεν έχετε ρυθμίσει καμία ταυτότητα στο συστατικό ταχυδρομείου."
+
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Δεν είναι δυνατή η ενεργοποίηση του επεξεργαστή του Evolution"
+
+#~ msgid "minute"
+#~ msgstr "λεπτό"
+
+#~ msgid "hour"
+#~ msgstr "ώρα"
+
+#~ msgid "week"
+#~ msgstr "εβδομάδα"
+
+#~ msgid "year"
+#~ msgstr "χρόνος"
+
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr ""
+#~ "Δεν είναι δυνατή η αρχικοποίηση του συστατικού μηνυμάτων του Evolution."
+
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr ""
+#~ "Δεν είναι δυνατή η αρχικοποίηση του συστατικού ρύθμισης μηνυμάτων του "
+#~ "Evolution."
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr ""
+#~ "Δεν είναι δυνατή η αρχικοποίηση του συστατικού πληροφοριών φακέλου του "
+#~ "Evolution."
+
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Έλεγχος ρυθμίσεων για την προβολή γραμματοσειρών του Evolution."
+
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr ""
+#~ "Έλεγχος ρυθμίσεων για τους λογαριασμούς αλληλογραφίας του Evolution."
+
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Έλεγχος ρυθμίσεων για την αλληλογραφία του Evolution."
+
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Έλεγχος ρυθμίσεων για τον επεξεργαστή μηνυμάτων του Evolution."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Συστατικό Evolution για την διαχείριση μηνυμάτων."
+
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Εργοστάσιο για τον επεξεργαστή του Evolution."
+
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "Συστατικό για το εργοστάσιο περίληψης Μηνυμάτων."
+
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr ""
+#~ "Εργοστάσιο για τους ελέγχους που εξάγονται από την αλληλογραφία Evolution."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Εργοστάσιο για την εισαγωγή αρχείων mbox στο Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Εισάγει αρχεία mbox στο Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr ""
+#~ "Εργοστάσιο για την εισαγωγή μηνύματα Outlook Express 4 στο Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Εισάγει αρχεία Outlook Express 4 στο Evolution"
+
+#~ msgid ""
+#~ "Please specify signature filename\n"
+#~ "in Advanced section of signature settings."
+#~ msgstr ""
+#~ "Παρακαλώ καθορίστε το όνομα αρχείου υπογραφής\n"
+#~ "στον τομέα Για προχωρημένους στις ρυθμίσεις υπογραφής."
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Γραμματοσειρές Οθόνης"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "_Σταθερού πλάτους"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "_Μεταβλητού-πλάτους"
+
+#~ msgid "All folders"
+#~ msgstr "Όλοι οι φάκελοι"
+
+#~ msgid "Apri file"
+#~ msgstr "Apri file"
+
+#~ msgid "Display Options"
+#~ msgstr "Ρυθμίσεις Εμφάνισης"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Φάκελοι που το όνομά τους αρχίζει από:"
+
+#~ msgid "Salve file"
+#~ msgstr "Salve file"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Έλεγχος ρυθμίσεων για την περίληψη του Evolution"
+
+#~ msgid "Evolution installation"
+#~ msgstr "Εγκατάσταση του Evolution"
+
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "Η νέα έκδοση του Evolution πρέπει να εγκαταστήσει συμπληρωματικά αρχεία\n"
+#~ "στον προσωπικό σας κατάλογο Evolution"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "Παρακαλώ επιλέξτε \"OK\"για να εγκατασταθούν τα αρχεία ή \"Ακύρωση\" για "
+#~ "έξοδο."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Δεν ήταν δυνατή η δημιουργία του καταλόγου\n"
+#~ "%s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Directory %s\n"
+#~ "does not have the right permissions. Please make it\n"
+#~ "readable and executable and restart Evolution."
+#~ msgstr ""
+#~ "Ο κατάλογος %s\n"
+#~ "δεν έχει τις αναγκαίες άδειες. Παρακαλώ δώστε άδεια\n"
+#~ "ανάγνωσης και εκτέλεσης και επανεκκινήστε το Evolution."
 
-#~ msgid "\n"
-#~ msgstr "\n"
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "Το αρχείο %s\n"
+#~ "πρέπει να αφαιρεθεί για να επιτραπεί στο Evolution να δουλέψει σωστά\n"
+#~ "Παρακαλώ αφαιρέστε το αρχείο και επανεκκινήστε το  Evolution."
+
+#~ msgid ""
+#~ "Evolution has detected an old\n"
+#~ "Executive-Summary directory.\n"
+#~ "This needs to be removed before\n"
+#~ "Evolution will run.\n"
+#~ "Do you want me to remove this directory?"
+#~ msgstr ""
+#~ "Το Evolution βρήκε έναν παλαιό κατάλογο\n"
+#~ "Εκτελεστικής Σύνοψης \n"
+#~ "Θα πρέπει να αφαιρεθεί πριν \n"
+#~ "το Evolution μπορέσει να εκτελεστεί \n"
+#~ "Θέλετε να αφαιρεθεί αυτός ο κατάλογος;"
+
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Δεν είναι δυνατή η αρχικοποίηση της διεπαφής του Βοηθού Ταχυδρομείου του "
+#~ "Evolution\n"
+#~ "(%s)"
+
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr ""
+#~ "Δεν είναι δυνατή η αρχικοποίηση της διεπαφής του Βοηθού Ταχυδρομείου του "
+#~ "Evolution\n"
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Το όνομα του φακέλου δεν μπορεί να περιέχει κάθετους."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Το Bug buddy δεν βρέθηκε στο $PATH σας."
+
+#~ msgid "Don't remove"
+#~ msgstr "Να μην αφαιρεθεί"
+
+#~ msgid "Active connections"
+#~ msgstr "Ενεργές συνδέσεις"
+
+#~ msgid "Host"
+#~ msgstr "Σύστημα"
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Εργοστάσιο για τον επεξεργαστή του Evolution."
+
+#~ msgid "Output File"
+#~ msgstr "Εξαγωγή Αρχείου"
+
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "Ρυθμίσεις Pilot Con_duit..."
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Ρυθμίσεις Ταχυδρομείου"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Ο διακομιστής προσωπικού βιβλίου διευθύνσεων"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Ο Προσωπικός Εξυπηρετητής Ημερολογίου, Εργοστάσιο Ημερολογίου"
diff --git a/po/en_AU.po b/po/en_AU.po
index 52c57a2dd8..266769a3bf 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2002-10-28 16:49-0500\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -13,40 +13,51 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-msgid "Factory to import LDIF files into Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-msgid "Imports LDIF files into Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr ""
 
@@ -56,16 +67,17 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr ""
 
@@ -75,12 +87,12 @@ msgid "Bus"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr ""
 
@@ -91,12 +103,13 @@ msgstr ""
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisation"
@@ -107,18 +120,18 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr ""
@@ -128,13 +141,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr ""
 
@@ -143,43 +156,43 @@ msgid "Bus 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr ""
@@ -190,15 +203,15 @@ msgid "TTY"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr ""
@@ -222,6 +235,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr ""
@@ -231,6 +245,7 @@ msgid "Off"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr ""
@@ -245,6 +260,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr ""
@@ -258,6 +274,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr ""
@@ -267,16 +284,19 @@ msgid "Nick"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1418
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1459
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr ""
 
@@ -294,301 +314,373 @@ msgid "FBUrl"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:100
-msgid "Anniversary"
+msgid "Default server calendar"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:100
-msgid "Anniv"
+msgid "icsCalendar"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
+msgid "Anniversary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Anniv"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+msgid "ECard"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-card-simple.c:893
 #: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
+#: addressbook/backend/ebook/e-card.c:1308
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "Chile"
+
+#: addressbook/backend/ebook/e-card.c:1328
+msgid "Address Label"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1335
+msgid "Phone"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "_Other Organiser"
+
+#: addressbook/backend/ebook/e-card.c:1355
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1369
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card.c:1390
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+msgid "Mailer"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1445
+msgid "Free/Busy URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1452
+msgid "ICS Calendar"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "_Other Organiser"
+
+#: addressbook/backend/ebook/e-card.c:1480
+msgid "Category List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1487
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1494
+msgid "Wants HTML set"
 msgstr ""
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-#: addressbook/backend/ebook/load-pine-addressbook.c:22
-#: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
-#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/e-card.c:1501
+msgid "List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1508
+msgid "List Show Addresses"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1515
+msgid "Arbitrary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1522
+msgid "ID"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1529
+msgid "Last Use"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1540
+msgid "Use Score"
+msgstr ""
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:2978
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+msgid "Using Distinguished Name (DN)"
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+msgid "Using Email Address"
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1572
-#: addressbook/backend/pas/pas-backend-ldap.c:1575
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Configure access to LDAP directory servers here"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:611
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1067
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public Contacts"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:648
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1193
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1630
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
-msgid "Could not initialize gnome-vfs"
-msgstr "Could not initialise gnome-vfs"
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 #, fuzzy
 msgid "Other Contacts"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:480
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -596,53 +688,56 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:537
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
 "is unreachable."
 msgstr ""
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:582
+#: addressbook/gui/component/addressbook.c:557
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Could not close temporary folder: %s"
 
-#: addressbook/gui/component/addressbook.c:633
-#: addressbook/gui/component/addressbook.c:636
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:956
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -650,7 +745,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:962
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -658,25 +753,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:968
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:975
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1050
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -685,132 +780,121 @@ msgstr ""
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/component/e-address-popup.c:478
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:2
-msgid "1234"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:3
-msgid "1:00"
+msgid "  S_how Supported Bases "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:4
-msgid "2:30"
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:5
-msgid "3268"
+msgid "1:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:6
-msgid "380"
+msgid "2:30"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
-msgid "389"
+msgid "3268"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
+msgid "389"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "636"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "666"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "<- _Remove"
+msgid "Add LDAP Server"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "<< Fewer Options"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -819,70 +903,54 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "DN Customization"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Email Address:"
+#: addressbook/gui/component/ldap-config.glade.h:22
+msgid "Edit LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:29
-msgid "Evolution Attribute"
+#: addressbook/gui/component/ldap-config.glade.h:23
+msgid "Email Address:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Mappings"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -892,69 +960,33 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:42
-msgid "Objectclasses Used in Evolution:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses Used on Server:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "R_estore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Re_store Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr ""
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
-#: calendar/gui/e-week-view.c:1240
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-msgid "Select"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -965,7 +997,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -974,51 +1006,44 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1026,7 +1051,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1035,7 +1060,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1043,17 +1068,17 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
 "directory tree. A search scope of \"sub\" will include all entries below "
 "your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1063,34 +1088,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1098,81 +1123,44 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:108
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Add ->"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Add Mapping"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-msgid "_Add to DN"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-msgid "_Always"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Delete Mapping"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Distinguished Name (DN):"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_Don't use SSL/TLS"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1182,192 +1170,137 @@ msgstr ""
 msgid "_Edit"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_Edit Mapping"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-msgid "_Evolution attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_If necessary "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "_LDAP attributes:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-msgid "_More Options >>"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:127
-msgid "_Restore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:131
-msgid "account-druid"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "account-editor"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:136
-msgid "edit_server_window_simple"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:139
-msgid "objectclasses-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
 msgstr ""
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:699
-#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
-#: shell/e-shortcuts-view.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
-msgid "Send HTML Mail?"
-msgstr ""
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "_Other Organiser"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+msgid "View Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
-msgid "Unnamed Contact List"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
+msgid "Send HTML Mail?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
+msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:506
-msgid "Unnamed Contact"
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+msgid "Source"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:564
+#: addressbook/gui/component/select-names/e-select-names.c:648
 msgid "Find contact in"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Find"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Selected Contacts:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show Contacts"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid ""
 "Type a name into the entry, or\n"
 "select one from the list below:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr ""
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr ""
@@ -1378,7 +1311,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr ""
 
@@ -1387,7 +1320,7 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr ""
 
@@ -1426,1286 +1359,1323 @@ msgstr "Organi_sation:"
 msgid "P_rofession:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "S_pouse:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "This is the _mailing address"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
-#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
-#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:183
+msgid "Editable"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Antarctica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Burkina Faso"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr "Comoros"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Macau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Moldova, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
 msgid "Pakistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
 msgid "Panama"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
 msgid "Peru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Vincent And The Grena-dines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "San Marino"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
 msgid "Suriname"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Tanzania, United Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tonga"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Virgin Islands, British"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Virgin Islands, U.S."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zimbabwe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:459
+msgid "Book"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
+msgid "Card"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+msgid "Is New Card"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "Chile"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:833
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2440
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
+msgid "E-mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
-msgid "E-mail"
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, c-format
+msgid "Error saving %s: %s"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:221
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/file-exists.glade.h:1
-msgid "Confirm Overwrite"
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:2
-msgid "Don't bother translating this string.  It's not used."
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 msgid "Overwrite"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_Post Code:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Dr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "Esq."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "List _name:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Members"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "contact-list-editor"
 msgstr ""
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+msgid "Is New List"
+msgstr ""
+
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2755,257 +2725,277 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:153
+#. FIXME: get the toplevel window...
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:408
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:466
+msgid "Query"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 msgid "Error getting book view"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+msgid "Model"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
-#: addressbook/gui/widgets/e-addressbook-util.c:91
-#: addressbook/gui/widgets/e-minicard.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1141
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1171
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
-#: camel/camel-service.c:739 camel/camel-service.c:779
-#: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:779
+#: camel/camel-service.c:849 camel/camel-service.c:892
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:63
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+msgid "_Discard"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
-#: addressbook/gui/widgets/e-addressbook-util.c:292
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
-#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1588
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-msgid "Display Cards?"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-msgid "Display Cards"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-util.c:213
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
-#: addressbook/gui/widgets/e-addressbook-view.c:813
-#: addressbook/gui/widgets/e-addressbook-view.c:1790
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Addressbook Sources..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:814
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:816
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Copy to folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Move to folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:826
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:827
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:828
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 msgid "Current View"
 msgstr ""
 
@@ -3013,7 +3003,7 @@ msgstr ""
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3021,11 +3011,11 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1290
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3093,20 +3083,55 @@ msgstr ""
 msgid "Primary Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+msgid "Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+msgid "Height"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -3115,28 +3140,44 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:452
+msgid "Adapter"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr ""
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+msgid "GTK Tree View"
+msgstr ""
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
 msgid "Print card"
 msgstr ""
 
@@ -3209,7 +3250,6 @@ msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr ""
 
@@ -3229,17 +3269,16 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr ""
 
@@ -3255,9 +3294,7 @@ msgstr ""
 msgid "Paper source:"
 msgstr ""
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr ""
 
@@ -3317,43 +3354,167 @@ msgstr ""
 msgid "Untitled appointment"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr ""
+
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1721
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3361,86 +3522,74 @@ msgstr ""
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:951
 #: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 #, fuzzy
-msgid "Factory for the Evolution Tasks control"
+msgid "Evolution Calendar and Tasks component"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "Factory to create a component editor factory"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Starting:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Ending:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
@@ -3462,11 +3611,17 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:741
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
+msgid "Warning"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:849
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3474,13 +3629,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:764
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3491,15 +3640,15 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:778
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "Could not initialise GNOME"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "Could not initialise gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3515,36 +3664,36 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:409 calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:416
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:440 calendar/gui/calendar-commands.c:442
 msgid "%d %B %Y"
 msgstr "%m/%d/%Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr ""
 
@@ -3553,395 +3702,304 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:397
-msgid "Private"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:398
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:542
-msgid "N"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:542
-msgid "S"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:544
-msgid "E"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:544
-msgid "W"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
-#: calendar/gui/e-calendar-table.c:470
-msgid "Free"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1165
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
-msgid "Not Started"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
-msgid "In Progress"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
-msgid "Completed"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1055
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
-#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
-#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
-msgid "None"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1723
-msgid "Recurring"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1725
-msgid "Assigned"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
-#: calendar/gui/e-meeting-model.c:862
-msgid "Yes"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:863
-msgid "No"
-msgstr ""
-
-#: calendar/gui/calendar-view-factory.c:148
-msgid "Day View"
-msgstr ""
-
-#: calendar/gui/calendar-view-factory.c:151
-msgid "Work Week View"
-msgstr ""
-
-#: calendar/gui/calendar-view-factory.c:154
-msgid "Week View"
-msgstr ""
-
-#: calendar/gui/calendar-view-factory.c:157
-msgid "Month View"
-msgstr ""
-
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr ""
 
-#: calendar/gui/component-factory.c:72
+#: calendar/gui/calendar-component.c:71
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:76
+#: calendar/gui/calendar-component.c:75
 msgid "Public Calendar"
 msgstr ""
 
-#: calendar/gui/component-factory.c:77
+#: calendar/gui/calendar-component.c:76
 msgid "Public folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
-#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1063
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/component-factory.c:82
+#: calendar/gui/calendar-component.c:81
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:86
+#: calendar/gui/calendar-component.c:85
 msgid "Public Tasks"
 msgstr ""
 
-#: calendar/gui/component-factory.c:87
+#: calendar/gui/calendar-component.c:86
 msgid "Public folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/calendar-component.c:730
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/calendar-component.c:730
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/calendar-component.c:731
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:755
+#: calendar/gui/calendar-component.c:735
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:755
+#: calendar/gui/calendar-component.c:735
 msgid "_Meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:756
+#: calendar/gui/calendar-component.c:736
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/component-factory.c:760
+#: calendar/gui/calendar-component.c:740
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:760
+#: calendar/gui/calendar-component.c:740
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:761
+#: calendar/gui/calendar-component.c:741
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:765
+#: calendar/gui/calendar-component.c:745
 msgid "New All Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:765
+#: calendar/gui/calendar-component.c:745
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:766
+#: calendar/gui/calendar-component.c:746
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/control-factory.c:123
-#, fuzzy, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Could not close temporary folder: %s"
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
+msgid "Private"
+msgstr ""
 
-#: calendar/gui/control-factory.c:167
-msgid "The URI that the calendar will display"
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
+#: calendar/gui/e-calendar-table.c:373
+msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/control-factory.c:174
-msgid "The type of view to show"
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
+msgid "Public"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:359
-msgid "Audio Alarm Options"
+#: calendar/gui/calendar-model.c:522
+msgid "N"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:368
-msgid "Message Alarm Options"
+#: calendar/gui/calendar-model.c:522
+msgid "S"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/calendar-model.c:524
+msgid "E"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:386
-msgid "Program Alarm Options"
+#: calendar/gui/calendar-model.c:524
+msgid "W"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:395
-msgid "Unknown Alarm Options"
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
+#: calendar/gui/e-calendar-table.c:445
+msgid "Free"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
-msgid "Alarm Repeat"
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
+msgid "Busy"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
+msgid "Not Started"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
+msgid "In Progress"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
+msgid "Completed"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1031
 msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:79
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
+msgid "None"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Play sound:"
+#: calendar/gui/calendar-model.c:1706
+msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Repeat the alarm"
+#: calendar/gui/calendar-model.c:1708
+msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Run program:"
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
+#: calendar/gui/e-meeting-model.c:838
+msgid "Yes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "With these arguments:"
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
+msgid "No"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
-#: filter/filter.glade.h:20
-msgid "days"
+#: calendar/gui/calendar-view-factory.c:118
+msgid "Day View"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "extra times every"
+#: calendar/gui/calendar-view-factory.c:121
+msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
-#: filter/filter.glade.h:21
-msgid "hours"
+#: calendar/gui/calendar-view-factory.c:124
+msgid "Week View"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
-#: filter/filter.glade.h:22
-msgid "minutes"
+#: calendar/gui/calendar-view-factory.c:127
+msgid "Month View"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
+#: calendar/gui/comp-editor-factory.c:456
+msgid "Error while opening the calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
+#: calendar/gui/comp-editor-factory.c:473
+msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
+#: calendar/gui/control-factory.c:119
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Could not close temporary folder: %s"
+
+#: calendar/gui/control-factory.c:165
+msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
+#: calendar/gui/control-factory.c:172
+msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
+#: calendar/gui/dialogs/alarm-options.c:420
+msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
+#: calendar/gui/dialogs/alarm-options.c:429
+msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
+#: calendar/gui/dialogs/alarm-options.c:438
+msgid "Email Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
+#: calendar/gui/dialogs/alarm-options.c:447
+msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
+#: calendar/gui/dialogs/alarm-options.c:456
+msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "Alarm Repeat"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+msgid "Message to Display"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Message to Send"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Play sound:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s %s before the start of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "Run program:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:416
-#, c-format
-msgid "%s %s after the start of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+msgid "Send To:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:421
-#, c-format
-msgid "%s at the start of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:430
-#, c-format
-msgid "%s %s before the end of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
+msgid "days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:433
-#, c-format
-msgid "%s %s after the end of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:438
-#, c-format
-msgid "%s at the end of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:12
+msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:462
-#, c-format
-msgid "%s at %s"
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
+msgid "hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:468
-#, c-format
-msgid "%s for an unknown trigger type"
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
+msgid "minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
@@ -3954,46 +4012,62 @@ msgstr ""
 msgid "Date/Time:"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an Email"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr ""
 
@@ -4017,7 +4091,7 @@ msgstr ""
 msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 msgid "Alerts"
 msgstr ""
 
@@ -4042,7 +4116,8 @@ msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr ""
 
@@ -4055,7 +4130,8 @@ msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr ""
 
@@ -4064,7 +4140,8 @@ msgid "S_un"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr ""
 
@@ -4077,7 +4154,8 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1137
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr ""
 
@@ -4095,7 +4173,8 @@ msgid "Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr ""
 
@@ -4112,7 +4191,8 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr ""
 
@@ -4121,7 +4201,8 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr ""
 
@@ -4163,7 +4244,7 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr ""
 
@@ -4203,155 +4284,159 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:56
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:59
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:65
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:74
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:77
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
 #, fuzzy
 msgid "Could not update object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1221
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
-#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1322
-#: calendar/gui/dialogs/comp-editor.c:1346
-#: calendar/gui/dialogs/comp-editor.c:1370
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1331
+#: calendar/gui/dialogs/comp-editor.c:1355
+#: calendar/gui/dialogs/comp-editor.c:1379
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4409,87 +4494,98 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:433
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-msgid "A_ll day event"
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
+msgid "Start date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:610
+msgid "End date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:633
+msgid "Start time is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:640
+msgid "End time is wrong"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:2
+msgid "A_ll day event"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr ""
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr ""
@@ -4498,19 +4594,23 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:414
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4550,16 +4650,11 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr ""
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
@@ -4567,13 +4662,6 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr ""
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4584,99 +4672,81 @@ msgid "_Change Organizer"
 msgstr "_Change Organiser"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-msgid "st"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-msgid "nd"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-msgid "rd"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-msgid "th"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:75
+msgid "This and Future Instances"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:77
+msgid "All Instances"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:898
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 #, fuzzy
 msgid "Other Date"
 msgstr "_Other Organiser"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr ""
 
@@ -4740,22 +4810,26 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:59
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:70
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
+#: calendar/gui/dialogs/task-details-page.c:397
+msgid "Completed date is wrong"
+msgstr ""
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -4766,42 +4840,40 @@ msgstr ""
 msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
-msgid "Needs Action"
-msgstr ""
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:860
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:216
-#: calendar/gui/dialogs/task-editor.c:261
-#: calendar/gui/dialogs/task-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
+#: calendar/gui/dialogs/task-page.c:527
+msgid "Due date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr ""
 
@@ -4809,135 +4881,232 @@ msgstr ""
 msgid "Sta_rt Date:"
 msgstr ""
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr ""
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:418
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:419
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:420
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:421
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:422
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:423
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-calendar-table.c:424
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-calendar-table.c:425
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
-#: calendar/gui/e-week-view.c:1917
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1910
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
-#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
-#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
-#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
-#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
-#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
-#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
-#: calendar/gui/e-week-view.c:4240
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1360
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -4946,8 +5115,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1096
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr ""
 
@@ -4976,8 +5145,8 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:748
-#: shell/e-shortcuts.c:1051
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr ""
 
@@ -4985,19 +5154,15 @@ msgstr ""
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr ""
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:166
+#: e-util/e-time-utils.c:379
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:161
+#: e-util/e-time-utils.c:388
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -5009,470 +5174,543 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:518
+#: calendar/gui/e-day-view-time-item.c:529
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
+#: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
-#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+msgid "Yes. (Complex Recurrence)"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:716
+msgid "Every day"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "Every %d days"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:724
+msgid "Every week"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:726
+#, c-format
+msgid "Every %d weeks"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:729
+msgid "Every week on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:731
+#, c-format
+msgid "Every %d weeks on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:739
+msgid " and "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:746
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:764
+msgid "every month"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:775
+msgid "Every year"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
-#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Location:"
 msgstr "Organisation"
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:490
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
-#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:444
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
-#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
-#: calendar/gui/e-itip-control.c:1245
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1441
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1916
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Could not close temporary folder: %s"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1739
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:2008
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Could not close temporary folder: %s"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr ""
 
@@ -5513,219 +5751,223 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 msgid "Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:831
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
+#: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
+#: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+msgid "Needs Action"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:879
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2114
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr ""
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
+#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:544
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
 #: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Could not close temporary folder: %s"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1541
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1581
+#: calendar/gui/gnome-cal.c:1563
 #, c-format
 msgid "Adding alarms for %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5733,7 +5975,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5741,7 +5983,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1996
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
@@ -5807,314 +6049,173 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:70
-#, fuzzy
-msgid "Could not activate Bonobo"
-msgstr "Could not initialise Bonobo"
-
-#: calendar/gui/main.c:99
-msgid "Could not create the component editor factory"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "1st"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "2nd"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "3rd"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "4th"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "5th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "6th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "7th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "8th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "9th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "10th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "11th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "12th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "13th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "14th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "15th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "16th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "17th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "18th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "19th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "20th"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "21st"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "22nd"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "23rd"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "24th"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "25th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "26th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "27th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "28th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "29th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "30th"
-msgstr ""
-
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr ""
-
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
-#: calendar/gui/print.c:1896
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2364
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr ""
-
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
-#: my-evolution/e-summary.c:633
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:472
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6122,89 +6223,62 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
-#: mail/mail-callbacks.c:2912
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:108
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:120
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:133
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr ""
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr ""
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/importers/icalendar-importer.c:168
-#, fuzzy, c-format
-msgid "Can't get storage list from registry: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+msgid "iCalendar files (.ics)"
 msgstr ""
-"Can not get message: %s from folder %s\n"
-"  %s"
 
-#: calendar/importers/icalendar-importer.c:180
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:483
+#: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:663
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr ""
 
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr ""
@@ -7843,27 +7917,35 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+msgid "You may not import keys with this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:374
+msgid "You may not export keys with this cipher"
+msgstr ""
+
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Could not close temporary folder: %s"
@@ -7897,84 +7979,91 @@ msgstr "Synchronising \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-process.c:92
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Synchronising folders"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Can not open message"
 
-#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Synchronising folder"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Could not close temporary folder: %s"
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Could not close temporary folder: %s"
-
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -7983,18 +8072,18 @@ msgstr ""
 "Can not parse search expression: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -8023,7 +8112,7 @@ msgstr ""
 msgid "Copying messages"
 msgstr "Can not open message"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8031,70 +8120,71 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:711
+#: camel/camel-gpg-context.c:738
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:761
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:769
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
-#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
-#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:771
+#: camel/camel-gpg-context.c:798
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/camel-gpg-context.c:1082
-#, c-format
+#: camel/camel-gpg-context.c:1125
+#, fuzzy, c-format
 msgid ""
-"Failed to GPG %s message: %s\n"
+"Failed to GPG %s: %s\n"
 "\n"
 "%.*s"
-msgstr ""
+msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1088
-#, c-format
-msgid "Failed to GPG %s message: %s\n"
-msgstr ""
+#: camel/camel-gpg-context.c:1131
+#, fuzzy, c-format
+msgid "Failed to GPG %s: %s\n"
+msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1197
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
-#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
-#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1290
+#: camel/camel-gpg-context.c:1333
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Can not verify this message: could not create temporary file: %s"
@@ -8119,23 +8209,22 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr ""
 
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:93 camel/camel-lock.c:112
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:152
+#: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:268
+#: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -8145,51 +8234,51 @@ msgstr ""
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:157
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
@@ -8206,25 +8295,25 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 msgid "parse error"
 msgstr ""
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
@@ -8272,60 +8361,129 @@ msgid ""
 "the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-gssapi.c:48
+msgid "GSSAPI"
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:50
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:148
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:153
+msgid "The provided target_name parameter was ill-formed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:156
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:160
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:165
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:169
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:180
+msgid "The consistency checks performed on the credential failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:183
+msgid "The referenced credentials have expired."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
+msgid "Bad authentication response from server."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/camel-sasl-gssapi.c:299
+msgid "Unsupported security layer."
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr ""
-
 #: camel/camel-sasl-login.c:32
 msgid "Login"
 msgstr ""
@@ -8372,7 +8530,7 @@ msgstr ""
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
@@ -8392,35 +8550,35 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:774 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 msgid "Resolving address"
 msgstr ""
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8432,181 +8590,181 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:354 camel/camel-session.c:422
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:171
 #, c-format
 msgid "Please enter your password for %s"
 msgstr ""
 
-#: camel/camel-smime-context.c:203
+#: camel/camel-smime-context.c:201
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr ""
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr ""
 
-#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
+#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr ""
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr ""
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 msgid "Failed to decode message."
 msgstr ""
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Can not get folder: Invalid operation on this store"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Can not create folder: Invalid operation on this store"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8615,15 +8773,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8636,7 +8794,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:690
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8646,35 +8804,35 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:734
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:786
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:804
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -8689,40 +8847,40 @@ msgstr ""
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "You can not copy messages from this rubbish bin."
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Can not delete folder: %s: Invalid operation"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Can not delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Can not rename folder: %s: Invalid operation"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Can not rename folder: %s: No such folder"
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2611
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2614
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8745,54 +8903,54 @@ msgstr ""
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:655
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:691
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:221
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:240
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:306
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:548
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1872
+#: camel/providers/imap/camel-imap-folder.c:1873
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8801,24 +8959,24 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1931
-#: camel/providers/imap/camel-imap-folder.c:2527
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2191
-#: camel/providers/imap/camel-imap-folder.c:2261
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2565
+#: camel/providers/imap/camel-imap-folder.c:2567
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8848,7 +9006,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr ""
 
@@ -8878,7 +9036,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr ""
 
@@ -8896,58 +9054,57 @@ msgstr ""
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1082
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1092
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1116
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1131
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1160
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8955,24 +9112,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1462
-#: camel/providers/imap/camel-imap-store.c:1604
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1851
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9045,8 +9202,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -9058,36 +9215,36 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:394
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9097,7 +9254,7 @@ msgstr ""
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:454
+#: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9110,14 +9267,14 @@ msgstr ""
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Can not append message to maildir folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9127,14 +9284,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:168
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9147,68 +9304,68 @@ msgid "`%s' is not a maildir directory."
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-maildir-store.c:205
 #: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:282
-#: camel/providers/local/camel-spool-store.c:312
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:416
-#: camel/providers/local/camel-maildir-summary.c:545
+#: camel/providers/local/camel-maildir-summary.c:417
+#: camel/providers/local/camel-maildir-summary.c:548
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Can not open maildir directory path: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 msgid "Checking folder consistency"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 msgid "Checking for new messages"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:729
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:583
-#: camel/providers/local/camel-mbox-summary.c:673
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Synchronising folder"
 
-#: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Can not create folder lock on %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Can not open mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Can not append message to mbox file: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:396
-#: camel/providers/local/camel-mbox-folder.c:404
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9217,11 +9374,11 @@ msgstr ""
 "Can not get message: %s from folder %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -9258,75 +9415,75 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:350
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:398
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:453
+#: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:678
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-spool-summary.c:169
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-mbox-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:621
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:716
-#: camel/providers/local/camel-mbox-summary.c:724
-#: camel/providers/local/camel-mbox-summary.c:913
-#: camel/providers/local/camel-mbox-summary.c:921
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:848
-#: camel/providers/local/camel-spool-summary.c:332
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:812
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:976
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error writing to temporary mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:993
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Writing to temporary mailbox failed: %s: %s"
@@ -9345,67 +9502,67 @@ msgstr "Can not append message to mh folder: %s: %s"
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/local/camel-mh-summary.c:243
+#: camel/providers/local/camel-mh-summary.c:244
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Can not open MH directory path: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spool folders can not be deleted"
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:176
+#: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:193
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool folders can not be deleted"
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Spool folders can not be deleted"
 
-#: camel/providers/local/camel-spool-summary.c:181
-#: camel/providers/local/camel-spool-summary.c:190
-#: camel/providers/local/camel-spool-summary.c:199
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:214
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:244
-#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
 #: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
@@ -9482,44 +9639,44 @@ msgid "Retrieving POP summary"
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:427
-#: camel/providers/pop3/camel-pop3-folder.c:486
-#: camel/providers/pop3/camel-pop3-folder.c:503
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
 msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:264
+#: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:401
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:408
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:488
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr ""
 
@@ -9536,7 +9693,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr ""
 
@@ -9557,66 +9714,66 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:614
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr ""
 
@@ -9626,49 +9783,49 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr ""
 
@@ -9676,135 +9833,135 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:342
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
@@ -9831,11 +9988,11 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
@@ -9844,61 +10001,61 @@ msgstr ""
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "HELO response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9906,77 +10063,77 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:113
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:520
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:177
+#: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -9994,11 +10151,15 @@ msgid "MIME type:"
 msgstr ""
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:163
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr ""
 
@@ -10009,45 +10170,45 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:400
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr ""
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:436
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:440
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10056,86 +10217,89 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
 msgid "Posting destination"
 msgstr ""
 
-#: composer/e-msg-composer-select-file.c:275
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Could not close temporary folder: %s"
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr ""
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1285
+#, c-format
+msgid ""
+"Unable to copy file descriptor: %s\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10143,33 +10307,38 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1536
+#: composer/e-msg-composer.c:1555
+msgid "_Discard Changes"
+msgstr ""
+
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2796
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2822
+#: composer/e-msg-composer.c:2931
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10177,29 +10346,18 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3858
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:393
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-
-#: composer/evolution-composer.c:408
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "Cannot initialise Evolution's composer."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr ""
@@ -10249,290 +10407,404 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
-#: mail/mail-display.c:192
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:5
+msgid "<b>Status:</b>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:12
+msgid "Out of Office Assistant"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:13
+msgid "Yes, Change Status"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+msgid "<b>Receiving Email</b>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:3
+msgid "<b>Sending Email:</b>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:9
+msgid "Read Receipts"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
+#: e-util/e-component-listener.c:128
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr ""
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr ""
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 msgid "Sync Categories:"
 msgstr ""
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:171 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:176 e-util/e-time-utils.c:375
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:181
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:186
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:197
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:201
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:206
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:216
 msgid "%m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:221
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:325 e-util/e-time-utils.c:424
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:329 e-util/e-time-utils.c:416
 msgid "%H:%M:%S"
 msgstr ""
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
+#: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
+#: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr ""
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:342
 msgid "%I %p"
 msgstr ""
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:181
-msgid "seconds"
+#: filter/filter-datespec.c:65
+msgid "1 second ago"
 msgstr ""
 
-#: filter/filter-datespec.c:71
-msgid "minute"
+#: filter/filter-datespec.c:65
+#, c-format
+msgid "%d seconds ago"
 msgstr ""
 
-#: filter/filter-datespec.c:72
-msgid "hour"
+#: filter/filter-datespec.c:66
+msgid "1 minute ago"
 msgstr ""
 
-#: filter/filter-datespec.c:74
-msgid "week"
+#: filter/filter-datespec.c:66
+#, c-format
+msgid "%d minutes ago"
 msgstr ""
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
+#: filter/filter-datespec.c:67
+msgid "1 hour ago"
 msgstr ""
 
-#: filter/filter-datespec.c:75
-msgid "month"
+#: filter/filter-datespec.c:67
+#, c-format
+msgid "%d hours ago"
 msgstr ""
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
+#: filter/filter-datespec.c:68
+msgid "1 day ago"
 msgstr ""
 
-#: filter/filter-datespec.c:76
-msgid "year"
+#: filter/filter-datespec.c:68
+#, c-format
+msgid "%d days ago"
 msgstr ""
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
+#: filter/filter-datespec.c:69
+msgid "1 week ago"
+msgstr ""
+
+#: filter/filter-datespec.c:69
+#, c-format
+msgid "%d weeks ago"
+msgstr ""
+
+#: filter/filter-datespec.c:70
+msgid "1 month ago"
+msgstr ""
+
+#: filter/filter-datespec.c:70
+#, c-format
+msgid "%d months ago"
+msgstr ""
+
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
+
+#: filter/filter-datespec.c:71
+#, c-format
+msgid "%d years ago"
 msgstr ""
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 msgid "You must choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr ""
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:279
+#: filter/filter-datespec.c:285
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%m/%d/%Y"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
-#, c-format
-msgid "%d %s ago"
-msgstr ""
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr ""
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr ""
 
-#: filter/filter-file.c:178
-msgid "You must specify a file name"
+#: filter/filter-file.c:166
+msgid "You must specify a file name."
 msgstr ""
 
-#: filter/filter-file.c:190
+#: filter/filter-file.c:184
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 msgid "Choose a file"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr ""
-
-#: filter/filter-folder.c:149
-msgid "You must specify a folder.\n"
+#: filter/filter-folder.c:155
+msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:62
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
 msgid "Important"
 msgstr ""
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133
+#: filter/filter-label.c:122 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 msgid "Work"
 msgstr ""
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1281
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124
+#: filter/filter-label.c:124 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1283
 msgid "Later"
 msgstr ""
 
-#: filter/filter-part.c:545 shell/evolution-test-component.c:49
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:223
+#: filter/filter-rule.c:219
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr ""
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr ""
 
@@ -10574,7 +10846,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr ""
 
@@ -10586,6 +10858,14 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr ""
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr ""
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr ""
@@ -10602,6 +10882,10 @@ msgstr ""
 msgid "vFolder Sources"
 msgstr ""
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr ""
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
@@ -10614,6 +10898,10 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr ""
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -10739,7 +11027,7 @@ msgstr ""
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 msgid "Label"
 msgstr ""
 
@@ -10767,7 +11055,7 @@ msgstr ""
 msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr ""
 
@@ -10795,12 +11083,12 @@ msgstr ""
 msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr ""
 
@@ -10836,8 +11124,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr ""
 
@@ -10845,74 +11134,88 @@ msgstr ""
 msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-editor.c:180
-msgid "Rules"
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
+#, c-format
+msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:239 filter/rule-editor.c:335
-#, c-format
-msgid "Rule name '%s' is not unique, choose another"
+#: filter/rule-editor.c:170
+msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr ""
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+msgid "Rule name"
+msgstr ""
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:499
+msgid "VFolder source"
+msgstr ""
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr ""
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr ""
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:353
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
 msgstr ""
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr ""
 
@@ -10922,12 +11225,12 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -10942,7 +11245,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -10950,7 +11253,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -10959,440 +11262,431 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
-#: shell/e-local-storage.c:183
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr ""
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Synchronising folders"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr ""
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure the fonts used by Evolution here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Evolution mail composer."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Mail folder viewer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr ""
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr ""
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:805
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:970
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:998
-#, fuzzy
-msgid "Warning: Unsent Messages"
-msgstr "Can not open message"
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 msgid "New Message Post"
 msgstr ""
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr ""
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Can not open message"
 
-#: mail/component-factory.c:1078
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/component-factory.c:1087
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Cannot initialise Evolution's mail config component."
-
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Cannot initialise Evolution's folder info component."
-
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1771
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 msgid "Cl_ear Flag"
 msgstr ""
 
 #. separator here?
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 msgid "Default"
 msgstr ""
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
 msgstr ""
 
 #: mail/local-config.glade.h:1
@@ -11426,97 +11720,96 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:159
+#: mail/mail-account-editor.c:146
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr ""
-
-#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
+msgid "[Default]"
+msgstr ""
+
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr ""
 
-#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:376
+#: mail/mail-autofilter.c:372
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11524,7 +11817,12 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:154
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr ""
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11532,218 +11830,236 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:211
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:254
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:356
+#: mail/mail-callbacks.c:313
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:364
+#: mail/mail-callbacks.c:322
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:777
+#: mail/mail-callbacks.c:722
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2584
-msgid "Save Message As..."
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
 msgstr ""
+"Can not get message: %s\n"
+"  %s"
 
-#: mail/mail-callbacks.c:2586
-msgid "Save Messages As..."
+#: mail/mail-callbacks.c:2470
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2655
-msgid "Go to next folder with unread messages?"
+#: mail/mail-callbacks.c:2511
+msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2662
-msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
+#: mail/mail-callbacks.c:2513
+msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2905
+#: mail/mail-callbacks.c:2687
 msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:3156
-msgid "US-Letter"
-msgstr ""
-
-#: mail/mail-callbacks.c:3197
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3387
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:223
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+msgid "Unnamed"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
-msgid " [script]"
+#: mail/mail-composer-prefs.c:335
+msgid "You must specify a valid script name."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+msgid "[script]"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
-msgid "Unnamed"
+#: mail/mail-composer-prefs.c:864
+msgid "Language(s)"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:876
-msgid "Add Signature"
+#: mail/mail-composer-prefs.c:926
+msgid "Signature(s)"
+msgstr ""
+
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+msgid "Receiving Mail"
+msgstr ""
+
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+msgid "Sending Mail"
+msgstr ""
+
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -11752,415 +12068,393 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:637
-msgid "Evolution Account Assistant"
-msgstr ""
-
-#: mail/mail-config.c:622
-#, c-format
-msgid "Account %d"
-msgstr ""
-
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2394 mail/mail-config.c:2398
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr ""
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "Automatically _detect links"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "C_olors"
 msgstr "C_lose"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Colours for display"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Can not open message"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Emacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr ""
-
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
-msgid "Microsoft"
+#: mail/mail-config.glade.h:75
+msgid "Message Fonts"
 msgstr ""
 
 #: mail/mail-config.glade.h:76
-msgid "New Mail Notification"
+msgid "Microsoft"
 msgstr ""
 
 #: mail/mail-config.glade.h:78
+msgid "New Mail Notification"
+msgstr ""
+
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "On Screen fonts"
-msgstr ""
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sation:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quote original message"
 msgstr "Can not open message"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "Receiving _Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "Restore Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
-msgid "Sent _messages folder:"
-msgstr ""
-
 #: mail/mail-config.glade.h:111
-msgid "Sent and Draft Messages"
+msgid "Sent _messages folder:"
 msgstr ""
 
 #: mail/mail-config.glade.h:112
-msgid "Ser_ver requires authentication"
+msgid "Sent and Draft Messages"
 msgstr ""
 
 #: mail/mail-config.glade.h:113
-msgid "Server Configuration"
+msgid "Ser_ver requires authentication"
 msgstr ""
 
 #: mail/mail-config.glade.h:114
-msgid "Server _Type: "
+msgid "Server Configuration"
 msgstr ""
 
 #: mail/mail-config.glade.h:115
-msgid "Shortcuts _type:"
+msgid "Server _Type: "
 msgstr ""
 
 #: mail/mail-config.glade.h:116
-msgid "Specify _filename:"
+msgid "Shortcuts _type:"
 msgstr ""
 
 #: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
+msgid "Specify _filename:"
 msgstr ""
 
 #: mail/mail-config.glade.h:118
@@ -12199,7 +12493,7 @@ msgstr ""
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 
 #: mail/mail-config.glade.h:134
@@ -12263,103 +12557,107 @@ msgid "_Enable"
 msgstr ""
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr ""
 
+#: mail/mail-config.glade.h:174
+msgid "_Standard Font:"
+msgstr ""
+
 #: mail/mail-config.glade.h:175
-msgid "_Use secure connection (SSL):"
+msgid "_Terminal Font:"
 msgstr ""
 
 #: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
+msgid "_Use secure connection (SSL):"
 msgstr ""
 
 #: mail/mail-config.glade.h:177
-msgid "_every"
+msgid "_Use the same fonts as other applications"
 msgstr ""
 
 #: mail/mail-config.glade.h:178
+msgid "_every"
+msgstr ""
+
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "color"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr ""
 
@@ -12383,191 +12681,194 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 msgid "Save Attachment..."
 msgstr ""
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr ""
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr ""
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
-#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:783 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:913 mail/message-list.etspec.h:7
-#: mail/message-tags.glade.h:3
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:922 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:927
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:932
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:963
-msgid "Mailer"
-msgstr ""
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1892
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:748
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
@@ -12577,18 +12878,18 @@ msgstr ""
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1351
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
@@ -12606,180 +12907,180 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:553 mail/mail-ops.c:582
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr ""
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr ""
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr ""
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr ""
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr ""
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr ""
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr ""
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr ""
 
@@ -12787,110 +13088,114 @@ msgstr ""
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr ""
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:272
-msgid "_Remember this password"
+#: mail/mail-session.c:258
+#, c-format
+msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:273
-msgid "_Remember this password for the remainder of this session"
+#: mail/mail-session.c:260
+msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:330
-#, c-format
-msgid "Enter Password for %s"
+#: mail/mail-session.c:280
+msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:333
-msgid "Enter Password"
+#: mail/mail-session.c:281
+msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-signature-editor.c:80
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr ""
-
-#: mail/mail-signature-editor.c:181
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-signature-editor.c:333
+#: mail/mail-signature-editor.c:229
+msgid "_Discard changes"
+msgstr ""
+
+#: mail/mail-signature-editor.c:233
+msgid "Save signature"
+msgstr ""
+
+#: mail/mail-signature-editor.c:389
 msgid "Edit signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:429
 msgid "Enter a name for this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr ""
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12899,97 +13204,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr ""
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr ""
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1066
+#: mail/message-list.c:1080
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2568
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr ""
 
@@ -13022,43 +13327,43 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr ""
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 msgid "Do Not Forward"
 msgstr ""
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:64
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:65
 msgid "For Your Information"
 msgstr ""
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr ""
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr ""
 
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr ""
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13084,53 +13389,44 @@ msgstr ""
 msgid "_Flag:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Synchronising folders"
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "All folders"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "Synchronising folder"
-
 #: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -13141,61 +13437,45 @@ msgid "Close"
 msgstr ""
 
 #: mail/subscribe-dialog.glade.h:4
-msgid "Display Options"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 msgid "S_elect server: "
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:9
-msgid "Salve file"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr ""
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Configuration control for the Evolution Summary."
-msgstr ""
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr ""
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Summary component."
+msgid "Evolution Summary"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
 #, fuzzy
-msgid "Factory for Evolution Summary's configuration control."
+msgid "Evolution Summary component"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
 #, fuzzy
-msgid "Factory for the Evolution Summary component."
+msgid "Evolution Summary configuration control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr ""
 
@@ -16612,7 +16892,7 @@ msgid "Hagerstown"
 msgstr ""
 
 #. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
 msgid "Hail"
 msgstr ""
 
@@ -18305,6004 +18585,5993 @@ msgid "Marion-Wytheville"
 msgstr ""
 
 #: my-evolution/Locations.h:1325
-msgid "Marquette"
-msgstr ""
-
-#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marshall"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marte"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marthas Vineyard"
 msgstr ""
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Martinsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsville"
 msgstr ""
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Maryland"
 msgstr ""
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Masirah"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massena"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Matamoros"
 msgstr "Comoros"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Mattoon"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mayaguez"
 msgstr ""
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayport"
 msgstr ""
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mazatlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McCall"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCarthy"
 msgstr ""
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McComb"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Meacham"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Medford"
 msgstr ""
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Mehamn"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melfa"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Mendoza"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merida"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Mexicali"
 msgstr ""
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Miami"
 msgstr ""
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Middle East"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middletown"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Midland"
 msgstr ""
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Miles City"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Milford"
 msgstr ""
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Milton"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minchumina"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minnesota"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minot"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missouri"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Mitchell"
 msgstr ""
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Moa"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Mobile Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobridge"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Modesto"
 msgstr ""
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mojave"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Molde"
 msgstr ""
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Moldova"
 msgstr ""
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Molokai"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monclova"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Moncton"
 msgstr ""
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Monida"
 msgstr ""
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monroe"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Montague"
 msgstr ""
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montana"
 msgstr ""
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Cimone"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monterey"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Monticello"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Montpelier"
 msgstr ""
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montrose"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Morelia"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Moriarty"
 msgstr ""
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Mosinee"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain View"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Vernon"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Mullan"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Muncie"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Murcia"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Mus"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Mykonos"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Namsos"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nanning"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Napa"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Naples"
 msgstr ""
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Napoli"
 msgstr ""
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Narvik"
 msgstr ""
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Natal"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natchez"
 msgstr ""
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nebraska"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Nenana"
 msgstr ""
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Nevada"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Newark"
 msgstr ""
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "New Bedford"
 msgstr ""
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bern"
 msgstr ""
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newcastle"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "New Delhi/Palam"
 msgstr ""
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "Newfoundland"
 msgstr ""
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Iberia"
 msgstr ""
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Jersey"
 msgstr ""
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Mexico"
 msgstr ""
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Orleans"
 msgstr ""
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "Newport"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New River"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "Newton"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "New York"
 msgstr ""
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Nimes-Garons"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nipawin"
 msgstr ""
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nis"
 msgstr ""
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "Nogales"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nome"
 msgstr ""
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Norfolk"
 msgstr ""
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norrkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "North Adams"
 msgstr ""
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Conway"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Platte"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "Northway"
 msgstr ""
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northwest Territories"
 msgstr ""
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norwich"
 msgstr ""
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Notodden"
 msgstr ""
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nuevo Laredo"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oakland"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Ocala"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Odense"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Oelwen"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Ogden"
 msgstr ""
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohrid"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Olathe"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omak"
 msgstr ""
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Omsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "Ontario"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Oostende"
 msgstr ""
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oran"
 msgstr ""
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 #, fuzzy
 msgid "Orange"
 msgstr "Organiser:"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Oregon"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orland"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orlando"
 msgstr ""
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Oruro"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Oscoda"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owyhee"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Oxford"
 msgstr ""
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paganella"
 msgstr ""
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palermo"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmer"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palm Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama City"
 msgstr ""
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Pantelleria"
 msgstr ""
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Papa"
 msgstr ""
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paris"
 msgstr ""
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Orly"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Pasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Patna"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paysandu"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Payson"
 msgstr ""
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Pellston"
 msgstr ""
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pelotas"
 msgstr ""
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pendleton"
 msgstr ""
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "Peoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Perm"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perth"
 msgstr ""
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Perugia"
 msgstr ""
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Pierre"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pikeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plymouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Point Hope"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Lay"
 msgstr ""
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Mugu"
 msgstr ""
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Poitiers"
 msgstr ""
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponce"
 msgstr ""
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Pontiac"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poprad"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Port Alexander"
 msgstr ""
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Porterville"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Port Hardy"
 msgstr ""
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hedland"
 msgstr ""
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Portland"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Porto"
 msgstr ""
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto Alegre"
 msgstr ""
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Portoroz"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Porto Santo"
 msgstr ""
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Port Said"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Posadas"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poznan"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Praha"
 msgstr ""
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Presidente Prudente"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Pretoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Preveza"
 msgstr ""
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Pristina"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Providence"
 msgstr ""
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Provincetown"
 msgstr ""
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provo"
 msgstr ""
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Puebla"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Suarez"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Pula"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pullman"
 msgstr ""
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Cana"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Quantico"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quebec"
 msgstr ""
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Reading"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Recife"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Redding"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redig"
 msgstr ""
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Regina"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Rennes"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Reno"
 msgstr ""
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Renton"
 msgstr ""
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Reus"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reyes"
 msgstr ""
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reynosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Rhinelander"
 msgstr ""
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Rickenbacker"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rieti"
 msgstr ""
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rifle"
 msgstr "Chile"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rijeka"
 msgstr ""
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 msgid "Rimini"
 msgstr ""
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
 msgid "Rivera"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
 msgid "Rivne"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
 msgid "Rivolto"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 msgid "Riyadh"
 msgstr ""
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
 msgid "Roatan"
 msgstr ""
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 msgid "Robore"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
 msgid "Rockland"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
 msgid "Rodos"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 msgid "Rogers"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
 #, fuzzy
 msgid "Roros"
 msgstr "Comoros"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
 msgid "Rosario"
 msgstr ""
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
 msgid "Roseglen"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 msgid "Rost"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 msgid "Russia"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 msgid "Rutland"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
 msgid "Sacramento"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
 msgid "Saginaw"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
 msgid "Saint Mary's"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 msgid "Saiq"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 msgid "Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 msgid "Salida"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
 msgid "Salina"
 msgstr ""
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 msgid "Salinas"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
 msgid "Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
 msgid "Salta"
 msgstr ""
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
 msgid "Salto"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
 msgid "Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
 msgid "Samara"
 msgstr ""
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 msgid "Samos"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 msgid "Samsun"
 msgstr ""
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
 msgid "San Carlos"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 msgid "Sandane"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 msgid "Sandberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 msgid "Sanderson"
 msgstr ""
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
 msgid "Sanford"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 msgid "Sangju"
 msgstr ""
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 msgid "San Jose"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
 msgid "San Juan"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
 msgid "Sanliurfa"
 msgstr ""
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 msgid "Santander"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
 msgid "Santorini"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 msgid "Santos"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
 msgid "Sarasota"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
 msgid "Sarzana"
 msgstr ""
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
 msgid "Sayun"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 msgid "Scatsta"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
 #, fuzzy
 msgid "Scranton"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
 msgid "Seattle-Boeing"
 msgstr ""
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 msgid "Sedalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 msgid "Seeb"
 msgstr ""
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
 msgid "Seward"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
 msgid "Shanghai"
 msgstr ""
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
 msgid "Sharjah"
 msgstr ""
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
 msgid "Sharurah"
 msgstr ""
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 msgid "Shawbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
 msgid "Sheldon"
 msgstr ""
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
 msgid "Shelton"
 msgstr ""
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
 msgid "Sheridan"
 msgstr ""
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
 msgid "Shiraz"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
 msgid "Shoreham"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 msgid "Show Low"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
 msgid "Sidney"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
 msgid "Silver City"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 msgid "Sindal"
 msgstr ""
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
 msgid "Skive"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 msgid "Skopje"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 msgid "Skwentna"
 msgstr ""
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 msgid "Slana"
 msgstr ""
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 msgid "Smithers"
 msgstr ""
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 msgid "Sochi"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 msgid "Socorro"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 msgid "Socotra"
 msgstr ""
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 msgid "Sofia"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 msgid "Sogndal"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 msgid "Somerset"
 msgstr ""
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 msgid "Sonderborg"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
 msgid "Southampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 msgid "South Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 msgid "South Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 msgid "Southend"
 msgstr ""
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
 msgid "Spencer"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
 msgid "Split"
 msgstr ""
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 msgid "Spokane"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
 #, fuzzy
 msgid "Springfield"
 msgstr "Synchronising folder"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 msgid "Stauning"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
 msgid "Staverton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 msgid "Stavropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
 msgid "St Joseph"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 msgid "St Louis"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
 msgid "Storm Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 msgid "Stornoway"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 msgid "St Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
 msgid "Sturgeon Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
 msgid "Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 msgid "Sumter"
 msgstr ""
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
 msgid "Sutton"
 msgstr ""
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
 msgid "Tabatinga"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 msgid "Tabuk"
 msgstr ""
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
 msgid "Tacna"
 msgstr ""
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
 msgid "Taejon"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
 msgid "Taif"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 msgid "Tainan"
 msgstr ""
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 msgid "Taiyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 msgid "Tajima"
 msgstr ""
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
 msgid "Tallinn"
 msgstr ""
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
 msgid "Tampa"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
 msgid "Tampere"
 msgstr ""
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
 msgid "Tanana"
 msgstr ""
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
 msgid "Taos"
 msgstr ""
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
 msgid "Taranto"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 msgid "Tarbes"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
 msgid "Tatalina"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
 msgid "Tela"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 msgid "Temple"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
 msgid "Texas"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
 msgid "Thisted"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
 msgid "Thumrait"
 msgstr ""
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 msgid "Tianjin"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 msgid "Tijuana"
 msgstr ""
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
 msgid "Tirana"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 msgid "Tiree"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
 msgid "Titusville"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 msgid "Tivat"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
 msgid "Toledo"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 msgid "Tonopah"
 msgstr ""
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 msgid "Topeka"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
 msgid "Torp"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 msgid "Torrance"
 msgstr ""
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 msgid "Torreon"
 msgstr ""
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 msgid "Tottori Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 msgid "Toulouse"
 msgstr ""
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 msgid "Trapani"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
 msgid "Trelew"
 msgstr ""
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 msgid "Trenton"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 msgid "Trevico"
 msgstr ""
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
 msgid "Trieste"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
 msgid "Truckee"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
 msgid "Tulcea"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 msgid "Tulsa"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 msgid "Tupelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 msgid "Turaif"
 msgstr ""
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 msgid "Turin"
 msgstr ""
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 msgid "Turku"
 msgstr ""
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
 msgid "Tyler"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
 msgid "Tyumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
 msgid "United Arab Emirates "
 msgstr ""
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 msgid "Uruguaiana"
 msgstr ""
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
 msgid "Utah"
 msgstr ""
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 msgid "Vadso"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 msgid "Vaerlose"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 msgid "Vagar"
 msgstr ""
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 msgid "Valdosta"
 msgstr ""
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
 msgid "Valencia"
 msgstr ""
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
 msgid "Van"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 msgid "Vandel"
 msgstr ""
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
 msgid "Varadero"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
 msgid "Varna"
 msgstr ""
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 msgid "Vasteras"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
 msgid "Venezia"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 msgid "Venice"
 msgstr ""
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 msgid "Vermont"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 msgid "Vernal"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
 msgid "Vicenza"
 msgstr ""
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
 msgid "Vilhena"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
 msgid "Visalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
 msgid "Vlieland"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 msgid "Volkel"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 msgid "Waco"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
 msgid "Warner Robins"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 msgid "Waterbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 msgid "Waterloo"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 msgid "Watertown"
 msgstr ""
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 msgid "Waterville"
 msgstr ""
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 msgid "Wejh"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
 msgid "Wenatchee"
 msgstr ""
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 msgid "Wendover"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 msgid "Westerland"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 msgid "Westfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
 msgid "Wheeling"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
 msgid "Wick"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 msgid "Wien"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
 msgid "Williston"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 msgid "Winslow"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
 msgid "Winter Park"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
 msgid "Wisconsin"
 msgstr ""
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
 msgid "Wise"
 msgstr ""
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 msgid "Wooster"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 msgid "Worcester"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 msgid "Worland"
 msgstr ""
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 msgid "Worthington"
 msgstr ""
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
 msgid "Wyoming"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 msgid "Xiamen"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
 msgid "Yenbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
 msgid "Zadar"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 msgid "Zagreb"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
 msgid "Zanesville"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 msgid "Zaragoza"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
 msgid "Zurich"
 msgstr ""
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+msgid "No appointments."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:418
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:420
-msgid "%l:%M %d %B"
+#: my-evolution/e-summary-calendar.c:407
+msgid "%l:%M%P %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:438
+#: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1102
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr ""
 
-#. translators: Put a list of codes for locations you want to see in
-#. My Evolution by default here. You can find the list of all
-#. stations and their codes in Evolution sources.
-#. (evolution/my-evolution/Locations)
-#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:591
-msgid "KBOS"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:584
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:848
+#: my-evolution/e-summary-preferences.c:621
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 msgid "Add"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr ""
 
-#: my-evolution/e-summary.c:188
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:584
+msgid "KBOS"
+msgstr ""
+
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr ""
 
-#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr ""
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "Could not initialise Bonobo.\n"
-
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " F"
 msgstr ""
 
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " C"
 msgstr ""
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "knots"
 msgstr ""
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr ""
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "inHg"
 msgstr ""
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "mmHg"
 msgstr ""
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 #, fuzzy
 msgid "miles"
 msgstr "Chile"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr ""
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr ""
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr ""
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr ""
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr ""
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
 msgid "Invalid"
 msgstr ""
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr ""
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr ""
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr ""
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr ""
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr ""
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr ""
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr ""
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr ""
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr ""
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr ""
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr ""
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr ""
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr ""
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr ""
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr ""
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr ""
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr ""
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr ""
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 msgid "Showers of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr ""
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr ""
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 msgid "Spray"
 msgstr ""
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 msgid "Light spray"
 msgstr ""
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 msgid "Moderate spray"
 msgstr ""
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 msgid "Heavy spray"
 msgstr ""
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 msgid "Shallow spray"
 msgstr ""
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 msgid "Partial spray"
 msgstr ""
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
 msgstr ""
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 msgid "Freezing spray"
 msgstr ""
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr ""
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
+#: my-evolution/metar.c:443 my-evolution/metar.c:452
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:443
+#: my-evolution/metar.c:444
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -24398,83 +24667,70 @@ msgstr ""
 msgid "_Weather"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 #, fuzzy
-msgid "Configuration control for Evolution folder settings."
+msgid "Evolution Shell"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 msgid "Folder Settings"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr ""
-
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr ""
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
 "%s"
 msgstr "Can not get folder: %s: %s"
 
-#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr ""
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 msgid "Add a Folder"
 msgstr ""
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 msgid "Drafts"
 msgstr ""
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
-#: shell/e-shortcuts.c:1055
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr ""
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr ""
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 msgid "Sent"
 msgstr ""
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr ""
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24482,38 +24738,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:282
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-
-#: shell/e-setup.c:300
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:306
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:329
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -24521,16 +24753,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:343
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -24542,24 +24765,24 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr ""
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 msgid "Select Default Folder"
 msgstr ""
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 msgid "Default Folders"
 msgstr ""
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "Synchronising folders"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 msgid "Autocompletion Folders"
 msgstr ""
 
@@ -24568,115 +24791,111 @@ msgstr ""
 msgid "Cannot copy folder: %s"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, fuzzy, c-format
 msgid "Cannot move folder: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:204
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:321
+#: shell/e-shell-folder-commands.c:319
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:365
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:406
+#: shell/e-shell-folder-commands.c:405
 #, c-format
-msgid "Delete \"%s\""
+msgid "Really delete folder \"%s\"?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:412
 #, c-format
-msgid "Really delete folder \"%s\"?"
+msgid "Delete \"%s\""
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:165
+#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-creation-dialog.c:170
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:586
+#: shell/e-shell-folder-commands.c:583
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:586
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
 "%s"
 msgstr "Can not get folder: %s: %s"
 
-#: shell/e-shell-folder-creation-dialog.c:122
+#: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 msgid "Create New Folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr ""
-
-#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -24685,274 +24904,273 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:552
 msgid "Evolution Error"
 msgstr ""
 
-#: shell/e-shell-importer.c:504
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr ""
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 #, fuzzy
 msgid "Syncing Folder"
 msgstr "Synchronising folder"
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:317
+#: shell/e-shell-offline-sync.c:311
 #, fuzzy, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Synchronising folder"
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:357
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+msgid "Please select a user."
+msgstr ""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Synchronising folder"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Synchronising folders"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, c-format
 msgid "in \"%s\" ..."
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:455
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Could not close temporary folder: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:513
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:159
-#, fuzzy, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr "Cannot initialise Evolution's Mail Wizard interface"
-
-#: shell/e-shell-startup-wizard.c:169
-#, fuzzy
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Cannot initialise Evolution's Mail Wizard interface"
-
-#: shell/e-shell-user-creatable-items-handler.c:579
-#: shell/e-shell-user-creatable-items-handler.c:633
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:636
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr ""
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr ""
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr ""
 
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
+#: shell/e-shell-utils.c:129
+msgid "Folder name cannot contain the character \"/\"."
 msgstr ""
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:135
+msgid "Folder name cannot contain the character \"#\"."
+msgstr ""
+
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:94
+#: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
+#: shell/e-shell-view-menu.c:193
+msgid "Bug buddy is not installed."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 msgid "Create New Shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:618
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1861
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1863
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr ""
 
-#: shell/e-shell-view.c:1910
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1917
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1923
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -24965,12 +25183,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24978,146 +25196,140 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:173
+#: shell/e-shortcuts-view.c:179
 #, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 msgid "Create _Default Shortcuts"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 msgid "Create Default Shortcuts"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:410
+#: shell/e-shortcuts-view.c:417
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr ""
 
@@ -25125,74 +25337,74 @@ msgstr ""
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Can not create folder lock on %s: %s"
 
-#: shell/e-storage.c:599
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-task-widget.c:191
+#: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:196
+#: shell/e-task-widget.c:216
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -25222,83 +25434,80 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr ""
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr ""
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr ""
 
@@ -25319,15 +25528,15 @@ msgstr ""
 msgid "_Tasks:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
@@ -25347,37 +25556,37 @@ msgstr ""
 msgid "_User:"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 
 #: shell/importer/import.glade.h:1
@@ -25411,41 +25620,42 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr ""
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr ""
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:102
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:227
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:266
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -25455,74 +25665,106 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:250
+#: shell/main.c:290
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:259
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:394
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:485
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:487
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:491
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr ""
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:493
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:542
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Can not initialise the Bonobo component system."
-
-#: tools/evolution-addressbook-abuse.c:80
-#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-abuse.c:81
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr ""
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
+#: tools/evolution-addressbook-import.c:82
+msgid "No filename provided."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:324
+msgid "An attachment to add."
 msgstr ""
 
-#: tools/evolution-addressbook-import.c:80
-msgid "No filename provided."
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:327
+msgid "Description of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:329
+msgid "Default subject for the message."
+msgstr ""
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "Could not close temporary folder: %s"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:3
@@ -25613,7 +25855,7 @@ msgstr ""
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr ""
 
@@ -25731,7 +25973,7 @@ msgid "Print this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr ""
 
@@ -25758,7 +26000,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr ""
 
@@ -26008,7 +26250,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr ""
 
@@ -26258,7 +26500,7 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Post a reply to a message message in a Public folder"
+msgid "Post a reply to a message in a Public folder"
 msgstr "You can not copy messages from this rubbish bin."
 
 #: ui/evolution-mail-message.xml.h:64
@@ -26413,7 +26655,7 @@ msgstr ""
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr ""
 
@@ -26428,12 +26670,12 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Close"
 msgstr ""
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr ""
 
@@ -26441,6 +26683,10 @@ msgstr ""
 msgid "Attach"
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr ""
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr ""
@@ -26608,7 +26854,7 @@ msgstr ""
 msgid "Save the current file and close the window"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr ""
 
@@ -26785,122 +27031,114 @@ msgid "Pi_lot Settings..."
 msgstr ""
 
 #: ui/evolution.xml.h:27
-msgid "Pilot Con_duit Settings..."
-msgstr ""
-
-#: ui/evolution.xml.h:28
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:31
-msgid "Set up Pilot conduit configuration"
-msgstr ""
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Set up Pilot configuration"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr ""
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr ""
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr ""
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 msgid "_Remove Other User's Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr ""
 
@@ -26976,9 +27214,8 @@ msgstr ""
 msgid "_Tasks"
 msgstr ""
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr ""
 
@@ -27001,20 +27238,20 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr ""
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:357
+#: widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr ""
 
@@ -27025,19 +27262,19 @@ msgid "MTWTFSS"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1070
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:797
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -27046,80 +27283,80 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 msgid "Visual"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr ""
 
@@ -27127,11 +27364,12 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr ""
 
@@ -27147,64 +27385,146 @@ msgstr ""
 msgid "_Advanced..."
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr ""
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 msgid "_Clear"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:833
+msgid "Item ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:840
+msgid "Subitem ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:847
+msgid "Text"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr ""
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr ""
+
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
+msgid "Evolution Calendar local file backend"
 msgstr ""
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+msgid "Evolution Addressbook local file backend"
 msgstr ""
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "Could not initialise GNOME-VFS"
+#, fuzzy
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "Could not initialise GNOME"
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "Could not initialise GNOME"
+#, fuzzy
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "Could not initialise Bonobo"
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "Could not initialise Bonobo"
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr ""
+#~ "Can not get message: %s from folder %s\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Cannot initialise Evolution's composer."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "Can not open message"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Cannot initialise Evolution's mail config component."
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Cannot initialise Evolution's folder info component."
+
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Could not initialise Bonobo.\n"
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr "Cannot initialise Evolution's Mail Wizard interface"
+
+#, fuzzy
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Cannot initialise Evolution's Mail Wizard interface"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Can not initialise the Bonobo component system."
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "Could not initialise GNOME-VFS"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "Could not initialise GNOME"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "Could not initialise Bonobo"
 
 #~ msgid "_Other Organizer"
 #~ msgstr "_Other Organiser"
diff --git a/po/en_GB.po b/po/en_GB.po
index 986f7dd8b0..0f2c9055ce 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2002-10-28 16:49-0500\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -13,41 +13,52 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Factory to import LDIF files into Evolution."
+msgid "Evolution LDIF importer"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-msgid "Imports LDIF files into Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr ""
 
@@ -57,16 +68,17 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr ""
 
@@ -76,12 +88,12 @@ msgid "Bus"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr ""
 
@@ -93,12 +105,13 @@ msgstr "Colours"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisation"
@@ -109,18 +122,18 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr ""
@@ -130,13 +143,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr ""
 
@@ -145,43 +158,43 @@ msgid "Bus 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr ""
@@ -192,15 +205,15 @@ msgid "TTY"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr ""
@@ -224,6 +237,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr ""
@@ -233,6 +247,7 @@ msgid "Off"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr ""
@@ -247,6 +262,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr ""
@@ -260,6 +276,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr ""
@@ -269,16 +286,19 @@ msgid "Nick"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1418
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1459
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr ""
 
@@ -296,306 +316,378 @@ msgid "FBUrl"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:100
-msgid "Anniversary"
+msgid "Default server calendar"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:100
-msgid "Anniv"
+#, fuzzy
+msgid "icsCalendar"
+msgstr "Colours"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
+msgid "Anniversary"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Anniv"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "Colours"
+
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-card-simple.c:893
 #: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
+#: addressbook/backend/ebook/e-card.c:1308
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "Colours"
+
+#: addressbook/backend/ebook/e-card.c:1328
+msgid "Address Label"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1335
+msgid "Phone"
 msgstr ""
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-#: addressbook/backend/ebook/load-pine-addressbook.c:22
-#: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
-#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "Organisation:"
+
+#: addressbook/backend/ebook/e-card.c:1355
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1369
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card.c:1390
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+msgid "Mailer"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1445
+msgid "Free/Busy URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Colours"
+
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Organisation:"
+
+#: addressbook/backend/ebook/e-card.c:1480
+msgid "Category List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1487
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1494
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1501
+msgid "List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1508
+msgid "List Show Addresses"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1515
+msgid "Arbitrary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1522
+msgid "ID"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1529
+msgid "Last Use"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1540
+msgid "Use Score"
+msgstr ""
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:2978
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+msgid "Using Distinguished Name (DN)"
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Synchronise \"%s\""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1572
-#: addressbook/backend/pas/pas-backend-ldap.c:1575
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Configure access to LDAP directory servers here"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Cannot initialise the Evolution shell."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #, fuzzy
-msgid "Factory for the Addressbook Minicard control"
+msgid "Evolution Addressbook LDAP Configuration Control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 #, fuzzy
-msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgid "Evolution Addressbook component"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:611
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1067
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public Contacts"
 msgstr "Organisation:"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:648
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1193
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1630
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
-#, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "Could not initialise Bonobo"
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 #, fuzzy
 msgid "Other Contacts"
 msgstr "Organisation:"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:480
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -603,53 +695,56 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:537
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
 "is unreachable."
 msgstr ""
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:582
+#: addressbook/gui/component/addressbook.c:557
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/addressbook.c:633
-#: addressbook/gui/component/addressbook.c:636
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:956
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -657,7 +752,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:962
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -665,25 +760,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:968
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:975
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1050
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -692,132 +787,121 @@ msgstr ""
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/component/e-address-popup.c:478
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:2
-msgid "1234"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:3
-msgid "1:00"
+msgid "  S_how Supported Bases "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:4
-msgid "2:30"
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:5
-msgid "3268"
+msgid "1:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:6
-msgid "380"
+msgid "2:30"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
-msgid "389"
+msgid "3268"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
+msgid "389"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "636"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "666"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "<- _Remove"
+msgid "Add LDAP Server"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "<< Fewer Options"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -826,73 +910,56 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Connecting"
 msgstr "Synchronise \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "DN Customization"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Email Address:"
+#: addressbook/gui/component/ldap-config.glade.h:22
+msgid "Edit LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
-msgid "Evolution Attribute"
-msgstr "Cannot initialise the Evolution shell."
+#: addressbook/gui/component/ldap-config.glade.h:23
+msgid "Email Address:"
+msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "LDAP Configuration Assistant"
 msgstr "Cannot initialise the Evolution shell."
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Mappings"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -902,71 +969,34 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:42
-msgid "Objectclasses Used in Evolution:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses Used on Server:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "R_estore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Re_store Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr ""
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
-#: calendar/gui/e-week-view.c:1240
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
-msgid "Select"
-msgstr "Synchronising \"%s\""
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -977,7 +1007,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -986,52 +1016,45 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Synchronise \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1039,7 +1062,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1048,7 +1071,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1056,17 +1079,17 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
 "directory tree. A search scope of \"sub\" will include all entries below "
 "your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1076,34 +1099,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1111,82 +1134,45 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:108
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Add ->"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Add Mapping"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-msgid "_Add to DN"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-msgid "_Always"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Delete Mapping"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Display name:"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Distinguished Name (DN):"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_Don't use SSL/TLS"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1196,194 +1182,138 @@ msgstr ""
 msgid "_Edit"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_Edit Mapping"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-#, fuzzy
-msgid "_Evolution attribute:"
-msgstr "Cannot initialise the Evolution shell."
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_If necessary "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "_LDAP attributes:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-msgid "_More Options >>"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:127
-msgid "_Restore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:131
-msgid "account-druid"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "account-editor"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Synchronise \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:136
-msgid "edit_server_window_simple"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:139
-msgid "objectclasses-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
 msgstr ""
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:699
-#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
-#: shell/e-shortcuts-view.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr ""
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Organisation:"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
-msgid "Send HTML Mail?"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+msgid "View Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
+msgid "Send HTML Mail?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
-msgid "Unnamed Contact List"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
+msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+msgid "Source"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:506
-msgid "Unnamed Contact"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:564
+#: addressbook/gui/component/select-names/e-select-names.c:648
 msgid "Find contact in"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Find"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Selected Contacts:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show Contacts"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid ""
 "Type a name into the entry, or\n"
 "select one from the list below:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr ""
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr ""
@@ -1394,7 +1324,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr ""
 
@@ -1403,7 +1333,7 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr ""
 
@@ -1443,1289 +1373,1328 @@ msgstr "Organisation:"
 msgid "P_rofession:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "S_pouse:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "This is the _mailing address"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
-#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
-#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:183
+#, fuzzy
+msgid "Editable"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Antarctica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:120
 #, fuzzy
 msgid "Argentina"
 msgstr "Organisation"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Burkina Faso"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 #, fuzzy
 msgid "Chile"
 msgstr "Colours"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 #, fuzzy
 msgid "Comoros"
 msgstr "Colours"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Macau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Moldova, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
 msgid "Pakistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
 msgid "Panama"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
 msgid "Peru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Vincent And The Grena-dines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "San Marino"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
 msgid "Suriname"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Tanzania, United Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tonga"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Virgin Islands, British"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Virgin Islands, U.S."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zimbabwe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:459
+msgid "Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
+#, fuzzy
+msgid "Card"
+msgstr "Colours"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+msgid "Is New Card"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+msgid "Writable Fields"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "Colours"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:833
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2440
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
+msgid "E-mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
-msgid "E-mail"
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, c-format
+msgid "Error saving %s: %s"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:221
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/file-exists.glade.h:1
-msgid "Confirm Overwrite"
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:2
-msgid "Don't bother translating this string.  It's not used."
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 msgid "Overwrite"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_Post Code:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Dr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "Esq."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "List _name:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Members"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "contact-list-editor"
 msgstr ""
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+msgid "Is New List"
+msgstr ""
+
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2775,261 +2744,279 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:153
+#. FIXME: get the toplevel window...
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:408
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:466
+msgid "Query"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 msgid "Error getting book view"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+msgid "Model"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
-#: addressbook/gui/widgets/e-addressbook-util.c:91
-#: addressbook/gui/widgets/e-minicard.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1141
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1171
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
-#: camel/camel-service.c:739 camel/camel-service.c:779
-#: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:779
+#: camel/camel-service.c:849 camel/camel-service.c:892
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:63
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+msgid "_Discard"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
-#: addressbook/gui/widgets/e-addressbook-util.c:292
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
-#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1588
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-#, fuzzy
-msgid "Display Cards?"
-msgstr "Synchronising \"%s\""
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-#, fuzzy
-msgid "Display Cards"
-msgstr "Synchronising \"%s\""
-
-#: addressbook/gui/widgets/e-addressbook-util.c:213
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
-#: addressbook/gui/widgets/e-addressbook-view.c:813
-#: addressbook/gui/widgets/e-addressbook-view.c:1790
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Addressbook Sources..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:814
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:816
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:826
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:827
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:828
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 msgid "Current View"
 msgstr ""
 
@@ -3037,7 +3024,7 @@ msgstr ""
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3045,11 +3032,11 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1290
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3117,20 +3104,55 @@ msgstr ""
 msgid "Primary Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+msgid "Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+msgid "Height"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -3139,28 +3161,45 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:452
+msgid "Adapter"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr ""
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+msgid "GTK Tree View"
+msgstr ""
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
 msgid "Print card"
 msgstr ""
 
@@ -3233,7 +3272,6 @@ msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr ""
 
@@ -3253,18 +3291,17 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 #, fuzzy
 msgid "Orientation"
 msgstr "Organisation"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr ""
 
@@ -3280,9 +3317,7 @@ msgstr ""
 msgid "Paper source:"
 msgstr ""
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr ""
 
@@ -3342,43 +3377,167 @@ msgstr ""
 msgid "Untitled appointment"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr ""
+
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1721
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3386,92 +3545,76 @@ msgstr ""
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:951
 #: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 #, fuzzy
-msgid "Factory for the Evolution Tasks control"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Evolution Calendar and Tasks"
+msgstr "Cannot initialise the Evolution shell."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 #, fuzzy
-msgid "Factory for the calendar iTip view control"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Evolution Calendar and Tasks component"
+msgstr "Cannot initialise Evolution's mail summary component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 #, fuzzy
-msgid "Factory for the sample Calendar control"
+msgid "Evolution Calendar configuration control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-#, fuzzy
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Cannot initialise Evolution's mail component."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 #, fuzzy
-msgid "Factory to create a component editor factory"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Evolution Calendar viewer"
+msgstr "Cannot initialise the Evolution shell."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Cannot initialise the Evolution shell."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Starting:"
 msgstr "Synchronise \"%s\""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Ending:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Cannot initialise the Evolution shell."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
@@ -3494,11 +3637,17 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:741
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
+msgid "Warning"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:849
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3506,13 +3655,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:764
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3523,16 +3666,16 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:778
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:173
 #, fuzzy
-msgid "Could not initialize GNOME"
+msgid "Could not initialize gnome-vfs"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3548,28 +3691,28 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:409 calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:416
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:440 calendar/gui/calendar-commands.c:442
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%m/%d/%Y"
@@ -3577,8 +3720,8 @@ msgstr "%m/%d/%Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr ""
 
@@ -3587,396 +3730,307 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:397
-msgid "Private"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:398
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:542
-msgid "N"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:542
-msgid "S"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:544
-msgid "E"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:544
-msgid "W"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
-#: calendar/gui/e-calendar-table.c:470
-msgid "Free"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1165
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
-msgid "Not Started"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
-msgid "In Progress"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
-msgid "Completed"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1055
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
-#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
-#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
-msgid "None"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1723
-msgid "Recurring"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1725
-msgid "Assigned"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
-#: calendar/gui/e-meeting-model.c:862
-msgid "Yes"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:863
-msgid "No"
-msgstr ""
-
-#: calendar/gui/calendar-view-factory.c:148
-msgid "Day View"
-msgstr ""
-
-#: calendar/gui/calendar-view-factory.c:151
-msgid "Work Week View"
-msgstr ""
-
-#: calendar/gui/calendar-view-factory.c:154
-msgid "Week View"
-msgstr ""
-
-#: calendar/gui/calendar-view-factory.c:157
-msgid "Month View"
-msgstr ""
-
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr ""
 
-#: calendar/gui/component-factory.c:72
+#: calendar/gui/calendar-component.c:71
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:76
+#: calendar/gui/calendar-component.c:75
 #, fuzzy
 msgid "Public Calendar"
 msgstr "Colours"
 
-#: calendar/gui/component-factory.c:77
+#: calendar/gui/calendar-component.c:76
 msgid "Public folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
-#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1063
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/component-factory.c:82
+#: calendar/gui/calendar-component.c:81
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:86
+#: calendar/gui/calendar-component.c:85
 msgid "Public Tasks"
 msgstr ""
 
-#: calendar/gui/component-factory.c:87
+#: calendar/gui/calendar-component.c:86
 msgid "Public folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/calendar-component.c:730
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/calendar-component.c:730
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/calendar-component.c:731
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:755
+#: calendar/gui/calendar-component.c:735
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:755
+#: calendar/gui/calendar-component.c:735
 msgid "_Meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:756
+#: calendar/gui/calendar-component.c:736
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/component-factory.c:760
+#: calendar/gui/calendar-component.c:740
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:760
+#: calendar/gui/calendar-component.c:740
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:761
+#: calendar/gui/calendar-component.c:741
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:765
+#: calendar/gui/calendar-component.c:745
 msgid "New All Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:765
+#: calendar/gui/calendar-component.c:745
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:766
+#: calendar/gui/calendar-component.c:746
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/control-factory.c:123
-#, fuzzy, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Synchronising \"%s\""
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
+msgid "Private"
+msgstr ""
 
-#: calendar/gui/control-factory.c:167
-msgid "The URI that the calendar will display"
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
+#: calendar/gui/e-calendar-table.c:373
+msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/control-factory.c:174
-msgid "The type of view to show"
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
+msgid "Public"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:359
-msgid "Audio Alarm Options"
+#: calendar/gui/calendar-model.c:522
+msgid "N"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:368
-msgid "Message Alarm Options"
+#: calendar/gui/calendar-model.c:522
+msgid "S"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/calendar-model.c:524
+msgid "E"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:386
-msgid "Program Alarm Options"
+#: calendar/gui/calendar-model.c:524
+msgid "W"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:395
-msgid "Unknown Alarm Options"
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
+#: calendar/gui/e-calendar-table.c:445
+msgid "Free"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
-msgid "Alarm Repeat"
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
+msgid "Busy"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
+msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display"
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
+msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Play sound:"
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
+msgid "Completed"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Repeat the alarm"
+#: calendar/gui/calendar-model.c:1031
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Run program:"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:79
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
+msgid "None"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "With these arguments:"
+#: calendar/gui/calendar-model.c:1706
+msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
-#: filter/filter.glade.h:20
-msgid "days"
+#: calendar/gui/calendar-model.c:1708
+msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "extra times every"
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
+#: calendar/gui/e-meeting-model.c:838
+msgid "Yes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
-#: filter/filter.glade.h:21
-msgid "hours"
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
+msgid "No"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
-#: filter/filter.glade.h:22
-msgid "minutes"
+#: calendar/gui/calendar-view-factory.c:118
+msgid "Day View"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
+#: calendar/gui/calendar-view-factory.c:121
+msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
+#: calendar/gui/calendar-view-factory.c:124
+msgid "Week View"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
+#: calendar/gui/calendar-view-factory.c:127
+msgid "Month View"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
+#: calendar/gui/comp-editor-factory.c:456
+msgid "Error while opening the calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
+#: calendar/gui/comp-editor-factory.c:473
+msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
+#: calendar/gui/control-factory.c:119
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Synchronising \"%s\""
+
+#: calendar/gui/control-factory.c:165
+msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
+#: calendar/gui/control-factory.c:172
+msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
+#: calendar/gui/dialogs/alarm-options.c:420
+msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
+#: calendar/gui/dialogs/alarm-options.c:429
+msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
+msgstr "Synchronising \"%s\""
+
+#: calendar/gui/dialogs/alarm-options.c:447
+msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
+#: calendar/gui/dialogs/alarm-options.c:456
+msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "Alarm Repeat"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+msgid "Message to Display"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Colours"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Play sound:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s %s before the start of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:416
-#, c-format
-msgid "%s %s after the start of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "Run program:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:421
-#, c-format
-msgid "%s at the start of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+msgid "Send To:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:430
-#, c-format
-msgid "%s %s before the end of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:433
-#, c-format
-msgid "%s %s after the end of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
+msgid "days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:438
-#, c-format
-msgid "%s at the end of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:462
-#, c-format
-msgid "%s at %s"
+#: calendar/gui/dialogs/alarm-options.glade.h:12
+msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:468
-#, c-format
-msgid "%s for an unknown trigger type"
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
+msgid "hours"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
+msgid "minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
@@ -3989,46 +4043,62 @@ msgstr ""
 msgid "Date/Time:"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an Email"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr ""
 
@@ -4052,7 +4122,7 @@ msgstr ""
 msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 msgid "Alerts"
 msgstr ""
 
@@ -4078,7 +4148,8 @@ msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr ""
 
@@ -4091,7 +4162,8 @@ msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr ""
 
@@ -4100,7 +4172,8 @@ msgid "S_un"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr ""
 
@@ -4113,7 +4186,8 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1137
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr ""
 
@@ -4131,7 +4205,8 @@ msgid "Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr ""
 
@@ -4148,7 +4223,8 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr ""
 
@@ -4157,7 +4233,8 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr ""
 
@@ -4199,7 +4276,7 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr ""
 
@@ -4239,155 +4316,159 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:56
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:59
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:65
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:74
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:77
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
 #, fuzzy
 msgid "Could not update object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1221
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
-#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1322
-#: calendar/gui/dialogs/comp-editor.c:1346
-#: calendar/gui/dialogs/comp-editor.c:1370
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1331
+#: calendar/gui/dialogs/comp-editor.c:1355
+#: calendar/gui/dialogs/comp-editor.c:1379
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4445,87 +4526,98 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:433
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-msgid "A_ll day event"
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
+msgid "Start date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:610
+msgid "End date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:633
+msgid "Start time is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:640
+msgid "End time is wrong"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:2
+msgid "A_ll day event"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr ""
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr ""
@@ -4534,19 +4626,23 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:414
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4586,16 +4682,11 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr ""
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
@@ -4603,13 +4694,6 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr ""
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 #, fuzzy
@@ -4622,99 +4706,81 @@ msgid "_Change Organizer"
 msgstr "Organisation:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-msgid "st"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-msgid "nd"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-msgid "rd"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-msgid "th"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:75
+msgid "This and Future Instances"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:77
+msgid "All Instances"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:898
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 #, fuzzy
 msgid "Other Date"
 msgstr "Organisation:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr ""
 
@@ -4778,22 +4844,26 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:59
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:70
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
+#: calendar/gui/dialogs/task-details-page.c:397
+msgid "Completed date is wrong"
+msgstr ""
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -4804,42 +4874,40 @@ msgstr ""
 msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
-msgid "Needs Action"
-msgstr ""
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:860
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:216
-#: calendar/gui/dialogs/task-editor.c:261
-#: calendar/gui/dialogs/task-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
+#: calendar/gui/dialogs/task-page.c:527
+msgid "Due date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr ""
 
@@ -4847,135 +4915,232 @@ msgstr ""
 msgid "Sta_rt Date:"
 msgstr ""
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr ""
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:418
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:419
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:420
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:421
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:422
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:423
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-calendar-table.c:424
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-calendar-table.c:425
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
-#: calendar/gui/e-week-view.c:1917
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1910
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
-#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
-#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
-#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
-#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
-#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
-#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
-#: calendar/gui/e-week-view.c:4240
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1360
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -4984,8 +5149,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1096
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr ""
 
@@ -5014,8 +5179,8 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:748
-#: shell/e-shortcuts.c:1051
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr ""
 
@@ -5023,19 +5188,15 @@ msgstr ""
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr ""
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:166
+#: e-util/e-time-utils.c:379
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:161
+#: e-util/e-time-utils.c:388
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -5047,472 +5208,545 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:518
+#: calendar/gui/e-day-view-time-item.c:529
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "Cannot initialise the Evolution shell."
 
-#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
-#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+msgid "Yes. (Complex Recurrence)"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:716
+msgid "Every day"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "Every %d days"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:724
+msgid "Every week"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:726
+#, c-format
+msgid "Every %d weeks"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:729
+msgid "Every week on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:731
+#, c-format
+msgid "Every %d weeks on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:739
+msgid " and "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:746
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:764
+msgid "every month"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:775
+msgid "Every year"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
-#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Location:"
 msgstr "Organisation"
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:490
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
-#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:444
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
-#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
-#: calendar/gui/e-itip-control.c:1245
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1441
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1916
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1739
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:2008
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2206
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Synchronising \"%s\""
@@ -5554,219 +5788,223 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 msgid "Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:831
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
+#: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
+#: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+msgid "Needs Action"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:879
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2114
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr ""
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
+#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:544
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
 #: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1541
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1581
+#: calendar/gui/gnome-cal.c:1563
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5774,7 +6012,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5782,7 +6020,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1996
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
@@ -5848,315 +6086,173 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:70
-#, fuzzy
-msgid "Could not activate Bonobo"
-msgstr "Could not initialise Bonobo"
-
-#: calendar/gui/main.c:99
-#, fuzzy
-msgid "Could not create the component editor factory"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/print.c:456
-msgid "1st"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "2nd"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "3rd"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "4th"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "5th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "6th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "7th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "8th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "9th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "10th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "11th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "12th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "13th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "14th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "15th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "16th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "17th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "18th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "19th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "20th"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "21st"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "22nd"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "23rd"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "24th"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "25th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "26th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "27th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "28th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "29th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "30th"
-msgstr ""
-
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr ""
-
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
-#: calendar/gui/print.c:1896
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2364
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr ""
-
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
-#: my-evolution/e-summary.c:633
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:472
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6164,90 +6260,63 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
-#: mail/mail-callbacks.c:2912
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:108
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:120
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:133
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Evolution Calendar intelligent importer"
+msgstr "Cannot initialise Evolution's mail summary component."
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 #, fuzzy
-msgid "Imports iCalendar files into Evolution"
+msgid "Evolution iCalendar importer"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 #, fuzzy
-msgid "Imports vCalendar files into Evolution"
+msgid "Evolution vCalendar importer"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/importers/icalendar-importer.c:168
-#, c-format
-msgid "Can't get storage list from registry: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+msgid "iCalendar files (.ics)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:180
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:483
+#: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:663
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr ""
 
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr ""
@@ -7886,27 +7955,35 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+msgid "You may not import keys with this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:374
+msgid "You may not export keys with this cipher"
+msgstr ""
+
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Synchronising \"%s\""
@@ -7940,104 +8017,111 @@ msgstr "Synchronising \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-process.c:92
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Synchronising \"%s\""
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Synchronising \"%s\""
-
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -8065,7 +8149,7 @@ msgstr ""
 msgid "Copying messages"
 msgstr ""
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8073,69 +8157,70 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:711
+#: camel/camel-gpg-context.c:738
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:761
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:769
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
-#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
-#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:771
+#: camel/camel-gpg-context.c:798
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1082
-#, c-format
+#: camel/camel-gpg-context.c:1125
+#, fuzzy, c-format
 msgid ""
-"Failed to GPG %s message: %s\n"
+"Failed to GPG %s: %s\n"
 "\n"
 "%.*s"
-msgstr ""
+msgstr "Synchronising \"%s\""
 
-#: camel/camel-gpg-context.c:1088
-#, c-format
-msgid "Failed to GPG %s message: %s\n"
-msgstr ""
+#: camel/camel-gpg-context.c:1131
+#, fuzzy, c-format
+msgid "Failed to GPG %s: %s\n"
+msgstr "Synchronising \"%s\""
 
-#: camel/camel-gpg-context.c:1197
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
-#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
-#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1290
+#: camel/camel-gpg-context.c:1333
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8160,23 +8245,22 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr ""
 
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:93 camel/camel-lock.c:112
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:152
+#: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:268
+#: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -8186,51 +8270,51 @@ msgstr ""
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:157
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
@@ -8247,25 +8331,25 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 msgid "parse error"
 msgstr ""
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
@@ -8313,60 +8397,129 @@ msgid ""
 "the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-gssapi.c:48
+msgid "GSSAPI"
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:50
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:148
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:153
+msgid "The provided target_name parameter was ill-formed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:156
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:160
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:165
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:169
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:180
+msgid "The consistency checks performed on the credential failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:183
+msgid "The referenced credentials have expired."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
+msgid "Bad authentication response from server."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-sasl-gssapi.c:299
+msgid "Unsupported security layer."
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr ""
-
 #: camel/camel-sasl-login.c:32
 msgid "Login"
 msgstr ""
@@ -8413,7 +8566,7 @@ msgstr ""
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
@@ -8433,36 +8586,36 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:774 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 #, fuzzy
 msgid "Resolving address"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8474,181 +8627,181 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:354 camel/camel-session.c:422
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:171
 #, c-format
 msgid "Please enter your password for %s"
 msgstr ""
 
-#: camel/camel-smime-context.c:203
+#: camel/camel-smime-context.c:201
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr ""
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr ""
 
-#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
+#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr ""
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr ""
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 msgid "Failed to decode message."
 msgstr ""
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8657,15 +8810,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8678,7 +8831,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:690
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8688,35 +8841,35 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:734
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:786
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:804
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -8731,39 +8884,39 @@ msgstr ""
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Synchronising \"%s\""
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2611
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2614
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8786,76 +8939,76 @@ msgstr ""
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:655
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:691
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:221
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:240
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:306
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:548
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1872
+#: camel/providers/imap/camel-imap-folder.c:1873
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1931
-#: camel/providers/imap/camel-imap-folder.c:2527
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2191
-#: camel/providers/imap/camel-imap-folder.c:2261
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2565
+#: camel/providers/imap/camel-imap-folder.c:2567
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8885,7 +9038,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr ""
 
@@ -8915,7 +9068,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr ""
 
@@ -8933,58 +9086,57 @@ msgstr ""
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1082
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1092
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1116
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1131
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1160
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8992,24 +9144,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1462
-#: camel/providers/imap/camel-imap-store.c:1604
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1851
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9082,8 +9234,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -9095,36 +9247,36 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:394
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9134,7 +9286,7 @@ msgstr ""
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:454
+#: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9147,14 +9299,14 @@ msgstr ""
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9164,14 +9316,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:168
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9184,80 +9336,80 @@ msgid "`%s' is not a maildir directory."
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-maildir-store.c:205
 #: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:282
-#: camel/providers/local/camel-spool-store.c:312
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:416
-#: camel/providers/local/camel-maildir-summary.c:545
+#: camel/providers/local/camel-maildir-summary.c:417
+#: camel/providers/local/camel-maildir-summary.c:548
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 msgid "Checking folder consistency"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 msgid "Checking for new messages"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:729
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:583
-#: camel/providers/local/camel-mbox-summary.c:673
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
 #, fuzzy
 msgid "Storing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:396
-#: camel/providers/local/camel-mbox-folder.c:404
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -9294,75 +9446,75 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:350
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:398
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:453
+#: camel/providers/local/camel-mbox-summary.c:447
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:678
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-spool-summary.c:169
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-mbox-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:621
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:716
-#: camel/providers/local/camel-mbox-summary.c:724
-#: camel/providers/local/camel-mbox-summary.c:913
-#: camel/providers/local/camel-mbox-summary.c:921
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:848
-#: camel/providers/local/camel-spool-summary.c:332
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:812
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:976
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:993
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -9381,67 +9533,67 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/local/camel-mh-summary.c:243
+#: camel/providers/local/camel-mh-summary.c:244
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:176
+#: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:193
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:181
-#: camel/providers/local/camel-spool-summary.c:190
-#: camel/providers/local/camel-spool-summary.c:199
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:214
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:244
-#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
 #: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
@@ -9518,42 +9670,42 @@ msgid "Retrieving POP summary"
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:427
-#: camel/providers/pop3/camel-pop3-folder.c:486
-#: camel/providers/pop3/camel-pop3-folder.c:503
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
 msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:264
+#: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:401
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:408
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:488
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr ""
 
@@ -9570,7 +9722,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr ""
 
@@ -9591,66 +9743,66 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/pop3/camel-pop3-store.c:614
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr ""
 
@@ -9660,49 +9812,49 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr ""
 
@@ -9710,135 +9862,135 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:342
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
@@ -9865,11 +10017,11 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
@@ -9877,61 +10029,61 @@ msgstr ""
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "HELO response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9939,77 +10091,77 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:113
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:520
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: composer/e-msg-composer-attachment.c:177
+#: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -10027,11 +10179,15 @@ msgid "MIME type:"
 msgstr ""
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:163
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr ""
 
@@ -10042,45 +10198,45 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:400
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr ""
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:436
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:440
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10089,86 +10245,89 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
 msgid "Posting destination"
 msgstr ""
 
-#: composer/e-msg-composer-select-file.c:275
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Synchronising \"%s\""
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr ""
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1285
+#, c-format
+msgid ""
+"Unable to copy file descriptor: %s\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10176,33 +10335,38 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1536
+#: composer/e-msg-composer.c:1555
+msgid "_Discard Changes"
+msgstr ""
+
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2796
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2822
+#: composer/e-msg-composer.c:2931
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10210,29 +10374,18 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3858
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:393
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-
-#: composer/evolution-composer.c:408
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "Cannot initialise Evolution's mail component."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr ""
@@ -10282,300 +10435,416 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
-#: mail/mail-display.c:192
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:5
+msgid "<b>Status:</b>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:12
+#, fuzzy
+msgid "Out of Office Assistant"
+msgstr "Cannot initialise the Evolution shell."
+
+#: designs/OOA/ooa.glade.h:13
+msgid "Yes, Change Status"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+msgid "<b>Receiving Email</b>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:3
+msgid "<b>Sending Email:</b>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:9
+msgid "Read Receipts"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
+#: e-util/e-component-listener.c:128
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr ""
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr ""
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 msgid "Sync Categories:"
 msgstr ""
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:171 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:176 e-util/e-time-utils.c:375
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:181
 #, fuzzy
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:186
 #, fuzzy
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:197
 #, fuzzy
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:201
 #, fuzzy
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:206
 #, fuzzy
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:211
 #, fuzzy
 msgid "%m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:216
 #, fuzzy
 msgid "%m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:221
 #, fuzzy
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:325 e-util/e-time-utils.c:424
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:329 e-util/e-time-utils.c:416
 msgid "%H:%M:%S"
 msgstr ""
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
+#: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
+#: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr ""
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:342
 msgid "%I %p"
 msgstr ""
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:181
-msgid "seconds"
+#: filter/filter-datespec.c:65
+msgid "1 second ago"
 msgstr ""
 
-#: filter/filter-datespec.c:71
-msgid "minute"
+#: filter/filter-datespec.c:65
+#, c-format
+msgid "%d seconds ago"
 msgstr ""
 
-#: filter/filter-datespec.c:72
-msgid "hour"
+#: filter/filter-datespec.c:66
+msgid "1 minute ago"
 msgstr ""
 
-#: filter/filter-datespec.c:74
-msgid "week"
+#: filter/filter-datespec.c:66
+#, c-format
+msgid "%d minutes ago"
 msgstr ""
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
+#: filter/filter-datespec.c:67
+msgid "1 hour ago"
 msgstr ""
 
-#: filter/filter-datespec.c:75
-msgid "month"
+#: filter/filter-datespec.c:67
+#, c-format
+msgid "%d hours ago"
 msgstr ""
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
+#: filter/filter-datespec.c:68
+msgid "1 day ago"
 msgstr ""
 
-#: filter/filter-datespec.c:76
-msgid "year"
+#: filter/filter-datespec.c:68
+#, c-format
+msgid "%d days ago"
 msgstr ""
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
+#: filter/filter-datespec.c:69
+msgid "1 week ago"
+msgstr ""
+
+#: filter/filter-datespec.c:69
+#, c-format
+msgid "%d weeks ago"
+msgstr ""
+
+#: filter/filter-datespec.c:70
+msgid "1 month ago"
+msgstr ""
+
+#: filter/filter-datespec.c:70
+#, c-format
+msgid "%d months ago"
 msgstr ""
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
+
+#: filter/filter-datespec.c:71
+#, c-format
+msgid "%d years ago"
+msgstr ""
+
+#: filter/filter-datespec.c:176
 #, fuzzy
 msgid "You must choose a date."
 msgstr "Synchronising \"%s\""
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr ""
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:279
+#: filter/filter-datespec.c:285
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%m/%d/%Y"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
-#, c-format
-msgid "%d %s ago"
-msgstr ""
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr ""
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr ""
 
-#: filter/filter-file.c:178
-msgid "You must specify a file name"
-msgstr ""
+#: filter/filter-file.c:166
+#, fuzzy
+msgid "You must specify a file name."
+msgstr "Synchronising \"%s\""
 
-#: filter/filter-file.c:190
+#: filter/filter-file.c:184
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 msgid "Choose a file"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr ""
-
-#: filter/filter-folder.c:149
+#: filter/filter-folder.c:155
 #, fuzzy
-msgid "You must specify a folder.\n"
+msgid "You must specify a folder."
 msgstr "Synchronising \"%s\""
 
-#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:62
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
 msgid "Important"
 msgstr ""
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133
+#: filter/filter-label.c:122 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 msgid "Work"
 msgstr ""
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1281
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124
+#: filter/filter-label.c:124 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1283
 msgid "Later"
 msgstr ""
 
-#: filter/filter-part.c:545 shell/evolution-test-component.c:49
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:223
+#: filter/filter-rule.c:219
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr ""
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr ""
 
@@ -10617,7 +10886,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr ""
 
@@ -10629,6 +10898,14 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr ""
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr ""
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr ""
@@ -10645,6 +10922,10 @@ msgstr ""
 msgid "vFolder Sources"
 msgstr ""
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr ""
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
@@ -10657,6 +10938,10 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr ""
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -10782,7 +11067,7 @@ msgstr ""
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 msgid "Label"
 msgstr ""
 
@@ -10810,7 +11095,7 @@ msgstr ""
 msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr ""
 
@@ -10838,12 +11123,12 @@ msgstr ""
 msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr ""
 
@@ -10880,8 +11165,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr ""
 
@@ -10889,75 +11175,90 @@ msgstr ""
 msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-editor.c:180
-msgid "Rules"
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
+#, c-format
+msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:239 filter/rule-editor.c:335
-#, c-format
-msgid "Rule name '%s' is not unique, choose another"
+#: filter/rule-editor.c:170
+msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr ""
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+msgid "Rule name"
+msgstr ""
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Synchronising \"%s\""
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "Synchronising \"%s\""
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr ""
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr ""
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Synchronise \"%s\""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:353
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
 msgstr ""
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr ""
 
@@ -10967,12 +11268,12 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -10987,7 +11288,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -10995,7 +11296,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11004,456 +11305,441 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
-#: shell/e-local-storage.c:183
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr ""
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Synchronise \"%s\""
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Synchronising \"%s\""
 
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr ""
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 #, fuzzy
 msgid "Configure the fonts used by Evolution here"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Cannot initialise the Evolution shell."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 #, fuzzy
-msgid "Evolution mail composer."
+msgid "Evolution Mail accounts configuration control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "Cannot initialise Evolution's mail summary component."
+msgid "Evolution Mail component"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Evolution mail folder display component."
-msgstr "Cannot initialise Evolution's mail summary component."
+msgid "Evolution Mail composer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 #, fuzzy
-msgid "Evolution mail folder factory component."
-msgstr "Cannot initialise Evolution's mail summary component."
+msgid "Evolution Mail composer configuration control"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
-msgid "Factory for the Evolution composer."
+msgid "Evolution Mail configuration interface"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
 #, fuzzy
-msgid "Factory for the Mail Summary component."
+msgid "Evolution Mail folder viewer"
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr ""
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr ""
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:805
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:970
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:998
-msgid "Warning: Unsent Messages"
-msgstr ""
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Colours"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr ""
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr ""
 
-#: mail/component-factory.c:1078
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/component-factory.c:1087
-#, fuzzy
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/component-factory.c:1093
-#, fuzzy
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1771
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Colours"
 
 #. separator here?
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default"
 msgstr "Synchronising \"%s\""
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Factory to import mbox into Evolution"
+msgid "Evolution mbox importer"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Cannot initialise Evolution's mail component."
+
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr ""
@@ -11485,97 +11771,97 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:159
+#: mail/mail-account-editor.c:146
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr ""
-
-#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
+#, fuzzy
+msgid "[Default]"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr ""
 
-#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:376
+#: mail/mail-autofilter.c:372
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11583,7 +11869,12 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:154
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr ""
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11591,218 +11882,236 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:211
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:254
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:356
+#: mail/mail-callbacks.c:313
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:364
+#: mail/mail-callbacks.c:322
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:777
+#: mail/mail-callbacks.c:722
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-callbacks.c:2470
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2655
-msgid "Go to next folder with unread messages?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2662
+#: mail/mail-callbacks.c:2687
 msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2905
-msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:3156
-msgid "US-Letter"
-msgstr ""
-
-#: mail/mail-callbacks.c:3197
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3387
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:223
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+msgid "Unnamed"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
-msgid " [script]"
-msgstr ""
+#: mail/mail-composer-prefs.c:335
+#, fuzzy
+msgid "You must specify a valid script name."
+msgstr "Synchronising \"%s\""
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+msgid "[script]"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
-msgid "Unnamed"
+#: mail/mail-composer-prefs.c:864
+msgid "Language(s)"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:876
-msgid "Add Signature"
+#: mail/mail-composer-prefs.c:926
+msgid "Signature(s)"
 msgstr ""
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr ""
+
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "Synchronise \"%s\""
+
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+msgid "Sending Mail"
+msgstr ""
+
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -11811,418 +12120,397 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:637
-msgid "Evolution Account Assistant"
-msgstr ""
-
-#: mail/mail-config.c:622
-#, c-format
-msgid "Account %d"
-msgstr ""
-
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2394 mail/mail-config.c:2398
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr ""
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "Automatically _detect links"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "C_olors"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Colours for display"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Emacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr ""
-
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Colours"
+
+#: mail/mail-config.glade.h:76
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "On Screen fonts"
-msgstr ""
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:111
-msgid "Sent and Draft Messages"
-msgstr ""
-
 #: mail/mail-config.glade.h:112
-msgid "Ser_ver requires authentication"
+msgid "Sent and Draft Messages"
 msgstr ""
 
 #: mail/mail-config.glade.h:113
-msgid "Server Configuration"
+msgid "Ser_ver requires authentication"
 msgstr ""
 
 #: mail/mail-config.glade.h:114
-msgid "Server _Type: "
+msgid "Server Configuration"
 msgstr ""
 
 #: mail/mail-config.glade.h:115
-msgid "Shortcuts _type:"
+msgid "Server _Type: "
 msgstr ""
 
 #: mail/mail-config.glade.h:116
-msgid "Specify _filename:"
+msgid "Shortcuts _type:"
 msgstr ""
 
 #: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
+msgid "Specify _filename:"
 msgstr ""
 
 #: mail/mail-config.glade.h:118
@@ -12261,7 +12549,7 @@ msgstr ""
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 
 #: mail/mail-config.glade.h:134
@@ -12325,103 +12613,107 @@ msgid "_Enable"
 msgstr ""
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr ""
 
+#: mail/mail-config.glade.h:174
+msgid "_Standard Font:"
+msgstr ""
+
 #: mail/mail-config.glade.h:175
-msgid "_Use secure connection (SSL):"
+msgid "_Terminal Font:"
 msgstr ""
 
 #: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
+msgid "_Use secure connection (SSL):"
 msgstr ""
 
 #: mail/mail-config.glade.h:177
-msgid "_every"
+msgid "_Use the same fonts as other applications"
 msgstr ""
 
 #: mail/mail-config.glade.h:178
+msgid "_every"
+msgstr ""
+
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "color"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr ""
 
@@ -12445,192 +12737,195 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 msgid "Save Attachment..."
 msgstr ""
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr ""
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr ""
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
-#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:783 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:913 mail/message-list.etspec.h:7
-#: mail/message-tags.glade.h:3
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:922 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:927
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:932
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:963
-msgid "Mailer"
-msgstr ""
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1892
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:748
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
@@ -12640,18 +12935,18 @@ msgstr ""
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1351
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
@@ -12669,182 +12964,182 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:553 mail/mail-ops.c:582
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr ""
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr ""
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr ""
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr ""
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr ""
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr ""
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr ""
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr ""
 
@@ -12852,110 +13147,114 @@ msgstr ""
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr ""
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:272
-msgid "_Remember this password"
+#: mail/mail-session.c:258
+#, c-format
+msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:273
-msgid "_Remember this password for the remainder of this session"
+#: mail/mail-session.c:260
+msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:330
-#, c-format
-msgid "Enter Password for %s"
+#: mail/mail-session.c:280
+msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:333
-msgid "Enter Password"
+#: mail/mail-session.c:281
+msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-signature-editor.c:80
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr ""
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr ""
-
-#: mail/mail-signature-editor.c:181
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-signature-editor.c:333
+#: mail/mail-signature-editor.c:229
+msgid "_Discard changes"
+msgstr ""
+
+#: mail/mail-signature-editor.c:233
+msgid "Save signature"
+msgstr ""
+
+#: mail/mail-signature-editor.c:389
 msgid "Edit signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:429
 msgid "Enter a name for this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr ""
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12964,99 +13263,99 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 #, fuzzy
 msgid "vFolders"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr ""
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr ""
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1066
+#: mail/message-list.c:1080
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2568
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr ""
 
@@ -13089,43 +13388,43 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr ""
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 msgid "Do Not Forward"
 msgstr ""
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:64
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:65
 msgid "For Your Information"
 msgstr ""
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr ""
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr ""
 
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr ""
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13152,54 +13451,44 @@ msgstr ""
 msgid "_Flag:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Synchronising \"%s\""
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:1
-#, fuzzy
-msgid "All folders"
-msgstr "Synchronising \"%s\""
-
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "Synchronising \"%s\""
-
 #: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -13211,66 +13500,47 @@ msgid "Close"
 msgstr "Colours"
 
 #: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Display Options"
-msgstr "Synchronising \"%s\""
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Synchronising \"%s\""
 
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "Synchronising \"%s\""
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr ""
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for the Evolution Summary."
-msgstr "Cannot initialise Evolution's mail summary component."
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Cannot initialise Evolution's mail summary component."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Summary component."
+msgid "Evolution Summary"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
 #, fuzzy
-msgid "Factory for Evolution Summary's configuration control."
+msgid "Evolution Summary component"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
 #, fuzzy
-msgid "Factory for the Evolution Summary component."
+msgid "Evolution Summary configuration control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr ""
 
@@ -16702,7 +16972,7 @@ msgid "Hagerstown"
 msgstr ""
 
 #. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
 msgid "Hail"
 msgstr ""
 
@@ -18397,6018 +18667,6006 @@ msgid "Marion-Wytheville"
 msgstr ""
 
 #: my-evolution/Locations.h:1325
-msgid "Marquette"
-msgstr ""
-
-#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marshall"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marte"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marthas Vineyard"
 msgstr ""
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Martinsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsville"
 msgstr ""
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Maryland"
 msgstr ""
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Masirah"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massena"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Matamoros"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Mattoon"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mayaguez"
 msgstr ""
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayport"
 msgstr ""
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mazatlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McCall"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCarthy"
 msgstr ""
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McComb"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Meacham"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Medford"
 msgstr ""
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Mehamn"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melfa"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Mendoza"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merida"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Mexicali"
 msgstr ""
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Miami"
 msgstr ""
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Middle East"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middletown"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Midland"
 msgstr ""
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Miles City"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Milford"
 msgstr ""
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Milton"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minchumina"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minnesota"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minot"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missouri"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Mitchell"
 msgstr ""
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Moa"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Mobile Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobridge"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Modesto"
 msgstr ""
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mojave"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Molde"
 msgstr ""
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Moldova"
 msgstr ""
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Molokai"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monclova"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Moncton"
 msgstr ""
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Monida"
 msgstr ""
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monroe"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Montague"
 msgstr ""
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montana"
 msgstr ""
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Cimone"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monterey"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Monticello"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Montpelier"
 msgstr ""
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montrose"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Morelia"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Moriarty"
 msgstr ""
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Mosinee"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain View"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Vernon"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Mullan"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Muncie"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Murcia"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Mus"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Mykonos"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Namsos"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 #, fuzzy
 msgid "Nanning"
 msgstr "Synchronise \"%s\""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Napa"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Naples"
 msgstr ""
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Napoli"
 msgstr ""
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Narvik"
 msgstr ""
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Natal"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natchez"
 msgstr ""
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nebraska"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Nenana"
 msgstr ""
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Nevada"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Newark"
 msgstr ""
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "New Bedford"
 msgstr ""
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bern"
 msgstr ""
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newcastle"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "New Delhi/Palam"
 msgstr ""
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "Newfoundland"
 msgstr ""
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Iberia"
 msgstr ""
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Jersey"
 msgstr ""
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Mexico"
 msgstr ""
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Orleans"
 msgstr ""
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "Newport"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New River"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "Newton"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "New York"
 msgstr ""
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Nimes-Garons"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nipawin"
 msgstr ""
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nis"
 msgstr ""
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "Nogales"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nome"
 msgstr ""
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Norfolk"
 msgstr ""
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norrkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "North Adams"
 msgstr ""
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Conway"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Platte"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "Northway"
 msgstr ""
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northwest Territories"
 msgstr ""
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norwich"
 msgstr ""
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Notodden"
 msgstr ""
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nuevo Laredo"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oakland"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Ocala"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Odense"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Oelwen"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Ogden"
 msgstr ""
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohrid"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Olathe"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omak"
 msgstr ""
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Omsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 #, fuzzy
 msgid "Ontario"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Oostende"
 msgstr ""
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oran"
 msgstr ""
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 #, fuzzy
 msgid "Orange"
 msgstr "Organisation:"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Oregon"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orland"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orlando"
 msgstr ""
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Oruro"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Oscoda"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owyhee"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Oxford"
 msgstr ""
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paganella"
 msgstr ""
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palermo"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmer"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palm Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama City"
 msgstr ""
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Pantelleria"
 msgstr ""
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Papa"
 msgstr ""
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paris"
 msgstr ""
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Orly"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Pasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Patna"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paysandu"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Payson"
 msgstr ""
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Pellston"
 msgstr ""
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pelotas"
 msgstr ""
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pendleton"
 msgstr ""
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "Peoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Perm"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perth"
 msgstr ""
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Perugia"
 msgstr ""
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Pierre"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pikeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plymouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Point Hope"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Lay"
 msgstr ""
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Mugu"
 msgstr ""
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Poitiers"
 msgstr ""
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponce"
 msgstr ""
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Pontiac"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poprad"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Port Alexander"
 msgstr ""
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Porterville"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Port Hardy"
 msgstr ""
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hedland"
 msgstr ""
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Portland"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Porto"
 msgstr ""
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto Alegre"
 msgstr ""
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Portoroz"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Porto Santo"
 msgstr ""
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Port Said"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Posadas"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poznan"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Praha"
 msgstr ""
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Presidente Prudente"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Pretoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Preveza"
 msgstr ""
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Pristina"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Providence"
 msgstr ""
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Provincetown"
 msgstr ""
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provo"
 msgstr ""
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Puebla"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Suarez"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Pula"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pullman"
 msgstr ""
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Cana"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Quantico"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quebec"
 msgstr ""
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Reading"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Recife"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Redding"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redig"
 msgstr ""
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Regina"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Rennes"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Reno"
 msgstr ""
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Renton"
 msgstr ""
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Reus"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reyes"
 msgstr ""
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reynosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Rhinelander"
 msgstr ""
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Rickenbacker"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rieti"
 msgstr ""
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rifle"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rijeka"
 msgstr ""
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 msgid "Rimini"
 msgstr ""
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
 msgid "Rivera"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
 msgid "Rivne"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
 msgid "Rivolto"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 msgid "Riyadh"
 msgstr ""
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
 msgid "Roatan"
 msgstr ""
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 msgid "Robore"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
 msgid "Rockland"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
 msgid "Rodos"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 msgid "Rogers"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
 #, fuzzy
 msgid "Roros"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
 msgid "Rosario"
 msgstr ""
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
 msgid "Roseglen"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 msgid "Rost"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 msgid "Russia"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 msgid "Rutland"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
 msgid "Sacramento"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
 msgid "Saginaw"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
 msgid "Saint Mary's"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 msgid "Saiq"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 msgid "Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 msgid "Salida"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
 msgid "Salina"
 msgstr ""
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 msgid "Salinas"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
 msgid "Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
 msgid "Salta"
 msgstr ""
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
 msgid "Salto"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
 msgid "Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
 msgid "Samara"
 msgstr ""
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 msgid "Samos"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 msgid "Samsun"
 msgstr ""
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
 msgid "San Carlos"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 msgid "Sandane"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 msgid "Sandberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 msgid "Sanderson"
 msgstr ""
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
 msgid "Sanford"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 msgid "Sangju"
 msgstr ""
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 msgid "San Jose"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
 msgid "San Juan"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
 msgid "Sanliurfa"
 msgstr ""
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 msgid "Santander"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
 msgid "Santorini"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 msgid "Santos"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
 msgid "Sarasota"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
 msgid "Sarzana"
 msgstr ""
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
 msgid "Sayun"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 msgid "Scatsta"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
 #, fuzzy
 msgid "Scranton"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
 msgid "Seattle-Boeing"
 msgstr ""
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 msgid "Sedalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 msgid "Seeb"
 msgstr ""
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
 msgid "Seward"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
 msgid "Shanghai"
 msgstr ""
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
 msgid "Sharjah"
 msgstr ""
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
 msgid "Sharurah"
 msgstr ""
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 msgid "Shawbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
 msgid "Sheldon"
 msgstr ""
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
 msgid "Shelton"
 msgstr ""
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
 msgid "Sheridan"
 msgstr ""
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
 msgid "Shiraz"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
 msgid "Shoreham"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 msgid "Show Low"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
 msgid "Sidney"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
 msgid "Silver City"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 msgid "Sindal"
 msgstr ""
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
 msgid "Skive"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 msgid "Skopje"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 msgid "Skwentna"
 msgstr ""
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 msgid "Slana"
 msgstr ""
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 msgid "Smithers"
 msgstr ""
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 msgid "Sochi"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 msgid "Socorro"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 msgid "Socotra"
 msgstr ""
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 msgid "Sofia"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 msgid "Sogndal"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 msgid "Somerset"
 msgstr ""
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 msgid "Sonderborg"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
 msgid "Southampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 msgid "South Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 msgid "South Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 msgid "Southend"
 msgstr ""
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
 msgid "Spencer"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
 msgid "Split"
 msgstr ""
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 msgid "Spokane"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
 #, fuzzy
 msgid "Springfield"
 msgstr "Synchronising \"%s\""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "Stauning"
 msgstr "Synchronise \"%s\""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
 msgid "Staverton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 msgid "Stavropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
 msgid "St Joseph"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 msgid "St Louis"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
 msgid "Storm Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 msgid "Stornoway"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 msgid "St Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
 msgid "Sturgeon Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
 msgid "Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 msgid "Sumter"
 msgstr ""
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
 msgid "Sutton"
 msgstr ""
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 msgid "Tabuk"
 msgstr ""
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
 msgid "Tacna"
 msgstr ""
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
 msgid "Taejon"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
 msgid "Taif"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 msgid "Tainan"
 msgstr ""
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 msgid "Taiyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 msgid "Tajima"
 msgstr ""
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
 #, fuzzy
 msgid "Tallinn"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
 msgid "Tampa"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
 msgid "Tampere"
 msgstr ""
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
 msgid "Tanana"
 msgstr ""
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
 msgid "Taos"
 msgstr ""
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
 msgid "Taranto"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 msgid "Tarbes"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
 #, fuzzy
 msgid "Tatalina"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
 msgid "Tela"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 msgid "Temple"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
 msgid "Texas"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
 msgid "Thisted"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
 msgid "Thumrait"
 msgstr ""
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 msgid "Tianjin"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 msgid "Tijuana"
 msgstr ""
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
 msgid "Tirana"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 msgid "Tiree"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
 msgid "Titusville"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 msgid "Tivat"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
 msgid "Toledo"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 msgid "Tonopah"
 msgstr ""
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 msgid "Topeka"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
 msgid "Torp"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 msgid "Torrance"
 msgstr ""
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 msgid "Torreon"
 msgstr ""
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 msgid "Tottori Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Toulouse"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 msgid "Trapani"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
 msgid "Trelew"
 msgstr ""
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trenton"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 msgid "Trevico"
 msgstr ""
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
 msgid "Trieste"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
 msgid "Truckee"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
 msgid "Tulcea"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 msgid "Tulsa"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 msgid "Tupelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 msgid "Turaif"
 msgstr ""
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 msgid "Turin"
 msgstr ""
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 msgid "Turku"
 msgstr ""
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
 #, fuzzy
 msgid "Tyler"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
 msgid "Tyumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
 msgid "United Arab Emirates "
 msgstr ""
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 msgid "Uruguaiana"
 msgstr ""
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
 msgid "Utah"
 msgstr ""
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 msgid "Vadso"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 msgid "Vagar"
 msgstr ""
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 msgid "Valdosta"
 msgstr ""
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
 msgid "Valencia"
 msgstr ""
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
 msgid "Van"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 msgid "Vandel"
 msgstr ""
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
 msgid "Varadero"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
 msgid "Varna"
 msgstr ""
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 msgid "Vasteras"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
 msgid "Venezia"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 msgid "Venice"
 msgstr ""
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 msgid "Vermont"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 msgid "Vernal"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
 msgid "Vicenza"
 msgstr ""
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
 msgid "Vilhena"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
 msgid "Visalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
 msgid "Vlieland"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 msgid "Volkel"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 msgid "Waco"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
 msgid "Warner Robins"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 msgid "Waterbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 msgid "Waterloo"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 msgid "Watertown"
 msgstr ""
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 msgid "Waterville"
 msgstr ""
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 msgid "Wejh"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
 msgid "Wenatchee"
 msgstr ""
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 msgid "Wendover"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 msgid "Westerland"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 msgid "Westfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
 msgid "Wheeling"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
 msgid "Wick"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 msgid "Wien"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
 msgid "Williston"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 msgid "Winslow"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
 msgid "Winter Park"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
 msgid "Wisconsin"
 msgstr ""
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
 msgid "Wise"
 msgstr ""
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Wooster"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 msgid "Worcester"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 msgid "Worland"
 msgstr ""
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 msgid "Worthington"
 msgstr ""
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
 msgid "Wyoming"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 msgid "Xiamen"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
 msgid "Yenbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
 msgid "Zadar"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 msgid "Zagreb"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
 msgid "Zanesville"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 msgid "Zaragoza"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
 msgid "Zurich"
 msgstr ""
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+msgid "No appointments."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:418
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:420
-msgid "%l:%M %d %B"
+#: my-evolution/e-summary-calendar.c:407
+msgid "%l:%M%P %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:438
+#: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1102
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr ""
 
-#. translators: Put a list of codes for locations you want to see in
-#. My Evolution by default here. You can find the list of all
-#. stations and their codes in Evolution sources.
-#. (evolution/my-evolution/Locations)
-#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:591
-msgid "KBOS"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:584
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:848
+#: my-evolution/e-summary-preferences.c:621
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 msgid "Add"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr ""
 
-#: my-evolution/e-summary.c:188
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:584
+msgid "KBOS"
+msgstr ""
+
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr ""
 
-#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr ""
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:68
-#, fuzzy
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "Could not initialise Bonobo"
-
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " F"
 msgstr ""
 
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " C"
 msgstr ""
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "knots"
 msgstr ""
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr ""
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "inHg"
 msgstr ""
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "mmHg"
 msgstr ""
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 #, fuzzy
 msgid "miles"
 msgstr "Colours"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr ""
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr ""
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr ""
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr ""
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr ""
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
 msgid "Invalid"
 msgstr ""
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr ""
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr ""
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr ""
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr ""
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr ""
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr ""
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr ""
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr ""
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr ""
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr ""
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr ""
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr ""
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr ""
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr ""
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr ""
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr ""
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr ""
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr ""
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 msgid "Showers of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr ""
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr ""
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 msgid "Spray"
 msgstr ""
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 msgid "Light spray"
 msgstr ""
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 msgid "Moderate spray"
 msgstr ""
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 msgid "Heavy spray"
 msgstr ""
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 msgid "Shallow spray"
 msgstr ""
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 msgid "Partial spray"
 msgstr ""
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
 msgstr ""
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 msgid "Freezing spray"
 msgstr ""
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr ""
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
+#: my-evolution/metar.c:443 my-evolution/metar.c:452
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:443
+#: my-evolution/metar.c:444
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -24505,87 +24763,73 @@ msgstr ""
 msgid "_Weather"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for Evolution folder settings."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 #, fuzzy
-msgid "Folder Settings"
-msgstr "Synchronising \"%s\""
+msgid "Evolution Shell"
+msgstr "Cannot initialise the Evolution shell."
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
 #, fuzzy
-msgid "The Evolution shell."
-msgstr "Cannot initialise the Evolution shell."
+msgid "Evolution folder settings configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Synchronising \"%s\""
 
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr ""
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
 "%s"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr ""
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 #, fuzzy
 msgid "Add a Folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 msgid "Drafts"
 msgstr ""
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
-#: shell/e-shortcuts.c:1055
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr ""
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr ""
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 #, fuzzy
 msgid "Sent"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr ""
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24593,38 +24837,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:282
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-
-#: shell/e-setup.c:300
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:306
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:329
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -24632,16 +24852,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:343
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -24653,27 +24864,27 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 #, fuzzy
 msgid "Autocompletion Folders"
 msgstr "Synchronising \"%s\""
@@ -24683,118 +24894,114 @@ msgstr "Synchronising \"%s\""
 msgid "Cannot copy folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, fuzzy, c-format
 msgid "Cannot move folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:204
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:321
+#: shell/e-shell-folder-commands.c:319
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 #, fuzzy
 msgid "Copy folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:365
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:406
+#: shell/e-shell-folder-commands.c:405
 #, c-format
-msgid "Delete \"%s\""
+msgid "Really delete folder \"%s\"?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:412
 #, c-format
-msgid "Really delete folder \"%s\"?"
+msgid "Delete \"%s\""
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:485
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 #, fuzzy
 msgid "Rename folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:165
+#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-creation-dialog.c:170
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:586
+#: shell/e-shell-folder-commands.c:583
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:586
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
 "%s"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-creation-dialog.c:122
+#: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr ""
-
-#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -24803,278 +25010,277 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:552
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-importer.c:504
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 #, fuzzy
 msgid "Select folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 #, fuzzy
 msgid "Syncing Folder"
 msgstr "Synchronising \"%s\""
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:317
+#: shell/e-shell-offline-sync.c:311
 #, fuzzy, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:345
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:357
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+msgid "Please select a user."
+msgstr ""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, c-format
 msgid "in \"%s\" ..."
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:455
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:513
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:159
-#, fuzzy, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr "Cannot initialise Evolution's mail storage hash."
-
-#: shell/e-shell-startup-wizard.c:169
-#, fuzzy
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Cannot initialise Evolution's mail storage hash."
-
-#: shell/e-shell-user-creatable-items-handler.c:579
-#: shell/e-shell-user-creatable-items-handler.c:633
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:636
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr ""
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr ""
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr ""
 
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
+#: shell/e-shell-utils.c:129
+msgid "Folder name cannot contain the character \"/\"."
 msgstr ""
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:135
+msgid "Folder name cannot contain the character \"#\"."
+msgstr ""
+
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:94
+#: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
+#: shell/e-shell-view-menu.c:193
+msgid "Bug buddy is not installed."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 msgid "Create New Shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:618
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1861
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1863
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr ""
 
-#: shell/e-shell-view.c:1910
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1917
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1923
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25087,12 +25293,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25100,146 +25306,140 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:173
+#: shell/e-shortcuts-view.c:179
 #, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 msgid "Create _Default Shortcuts"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 msgid "Create Default Shortcuts"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:410
+#: shell/e-shortcuts-view.c:417
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr ""
 
@@ -25247,74 +25447,74 @@ msgstr ""
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-storage.c:599
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-task-widget.c:191
+#: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:196
+#: shell/e-task-widget.c:216
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -25344,84 +25544,81 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Synchronising \"%s\""
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr ""
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr ""
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr ""
 
@@ -25443,15 +25640,15 @@ msgstr ""
 msgid "_Tasks:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
@@ -25471,38 +25668,38 @@ msgstr ""
 msgid "_User:"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Evolution Setup Assistant"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 
 #: shell/importer/import.glade.h:1
@@ -25536,41 +25733,42 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr ""
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr ""
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:102
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:227
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:266
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -25580,75 +25778,107 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:250
+#: shell/main.c:290
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:259
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:394
+#: shell/main.c:387
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:485
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:487
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:491
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr ""
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:493
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:542
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Cannot initialise the Bonobo component system."
-
-#: tools/evolution-addressbook-abuse.c:80
-#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-abuse.c:81
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr ""
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
+#: tools/evolution-addressbook-import.c:82
+msgid "No filename provided."
 msgstr ""
 
-#: tools/evolution-addressbook-import.c:80
-msgid "No filename provided."
+#: tools/evolution-launch-composer.c:324
+msgid "An attachment to add."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:327
+msgid "Description of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:329
+msgid "Default subject for the message."
+msgstr ""
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "Synchronising \"%s\""
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:3
@@ -25740,7 +25970,7 @@ msgstr ""
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr ""
 
@@ -25859,7 +26089,7 @@ msgid "Print this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr ""
 
@@ -25886,7 +26116,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr ""
 
@@ -26134,7 +26364,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr ""
 
@@ -26383,7 +26613,7 @@ msgid "Post a Reply"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Post a reply to a message message in a Public folder"
+msgid "Post a reply to a message in a Public folder"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:64
@@ -26538,7 +26768,7 @@ msgstr ""
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr ""
 
@@ -26553,13 +26783,13 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 #, fuzzy
 msgid "_Close"
 msgstr "Colours"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr ""
 
@@ -26567,6 +26797,10 @@ msgstr ""
 msgid "Attach"
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr ""
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr ""
@@ -26735,7 +26969,7 @@ msgstr ""
 msgid "Save the current file and close the window"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr ""
 
@@ -26915,125 +27149,116 @@ msgid "Pi_lot Settings..."
 msgstr "Cannot initialise the Evolution shell."
 
 #: ui/evolution.xml.h:27
-#, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "Cannot initialise the Evolution shell."
-
-#: ui/evolution.xml.h:28
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:31
-msgid "Set up Pilot conduit configuration"
-msgstr ""
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Set up Pilot configuration"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Cannot initialise the Evolution shell."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr ""
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Folder..."
 msgstr "Synchronising \"%s\""
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr ""
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr ""
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 msgid "_Remove Other User's Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr ""
 
@@ -27110,9 +27335,8 @@ msgstr ""
 msgid "_Tasks"
 msgstr ""
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr ""
 
@@ -27135,20 +27359,20 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr ""
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:357
+#: widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr ""
 
@@ -27159,19 +27383,19 @@ msgid "MTWTFSS"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1070
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:797
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -27180,81 +27404,81 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 #, fuzzy
 msgid "Traditional"
 msgstr "Organisation"
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 msgid "Visual"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr ""
 
@@ -27262,11 +27486,12 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr ""
 
@@ -27282,87 +27507,269 @@ msgstr ""
 msgid "_Advanced..."
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr ""
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "Colours"
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:833
+msgid "Item ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:840
+msgid "Subitem ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:847
+msgid "Text"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:925
 #, fuzzy
 msgid "Clear"
 msgstr "Colours"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr ""
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+msgid "Evolution Addressbook local/LDAP backend"
 msgstr ""
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+msgid "Evolution Addressbook local file backend"
 msgstr ""
 
-#: wombat/wombat.c:199
 #, fuzzy
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "Could not initialise Bonobo"
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Cannot initialise Evolution's mail component."
 
-#: wombat/wombat.c:211
 #, fuzzy
-msgid "init_corba(): could not initialize GNOME"
-msgstr "Could not initialise Bonobo"
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "Cannot initialise Evolution's mail component."
 
-#: wombat/wombat.c:224
 #, fuzzy
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "Could not initialise Bonobo"
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "Cannot initialise Evolution's mail component."
 
 #, fuzzy
-#~ msgid "en"
-#~ msgstr "Organisation"
+#~ msgid ""
+#~ "Factory for the configuration controls for the Evolution Addressbook."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Evolution Attribute"
+#~ msgstr "Cannot initialise the Evolution shell."
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Cannot initialise the Evolution shell."
+
+#, fuzzy
+#~ msgid "Display Cards?"
+#~ msgstr "Synchronising \"%s\""
 
 #, fuzzy
-#~ msgid "Could not create the alarm notify service"
+#~ msgid "Display Cards"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Calendar."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
 #, fuzzy
-#~ msgid "Configuration control for the Evolution Addressbook."
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "Could not initialise Bonobo"
+
+#, fuzzy
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "Could not initialise Bonobo"
+
+#, fuzzy
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Cannot initialise Evolution's mail summary component."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Factory to import mbox into Evolution"
 #~ msgstr "Cannot initialise Evolution's mail component."
 
 #, fuzzy
-#~ msgid "Evolution calendar executive summary component."
+#~ msgid "All folders"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Summary."
 #~ msgstr "Cannot initialise Evolution's mail summary component."
 
 #, fuzzy
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Could not initialise Bonobo"
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr "Cannot initialise Evolution's mail storage hash."
+
+#, fuzzy
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Cannot initialise Evolution's mail storage hash."
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Cannot initialise the Bonobo component system."
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "Cannot initialise the Evolution shell."
+
+#, fuzzy
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "Could not initialise Bonobo"
+
+#, fuzzy
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "Could not initialise Bonobo"
+
+#, fuzzy
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "Could not initialise Bonobo"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Organisation"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Addressbook."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
diff --git a/po/es.po b/po/es.po
index 081aa7694c..c19873a350 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.0\n"
-"POT-Creation-Date: 2003-04-02 11:42+0200\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-04-02 20:41+0200\n"
 "Last-Translator: Fco. Javier Fernández Serrador <serrador@arrakis.es>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
@@ -21,20 +21,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Fábrica para importar archivos LDIF a Evolution."
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Compositor de correo de Evolution."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Importa archivos LDIF a Evolution."
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Fábrica para importar archivos VCard a Evolution."
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Compositor de correo de Evolution."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importa archivos VCard a Evolution."
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Compositor de correo de Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/backend/ebook/e-card.c:1301
@@ -204,14 +211,14 @@ msgid "TTY"
 msgstr "Teletipo"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:482
+#: addressbook/gui/component/e-address-popup.c:488
 #: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Correo electrónico 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:492
+#: addressbook/gui/component/e-address-popup.c:498
 #: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
@@ -497,77 +504,77 @@ msgstr "Recibiendo los resultados de la búsqueda LDAP..."
 msgid "Error performing search"
 msgstr "Error efectuando búsqueda"
 
-#: addressbook/conduit/address-conduit.c:296
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Dirección de sincronización predeterminada:"
 
-#: addressbook/conduit/address-conduit.c:539
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "No se pudo cargar el cursor\n"
 
-#: addressbook/conduit/address-conduit.c:552
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook no cargado\n"
 
-#: addressbook/conduit/address-conduit.c:1378
-#: calendar/conduits/calendar/calendar-conduit.c:1344
-#: calendar/conduits/todo/todo-conduit.c:886
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "No se ha podido iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:1379
-#: calendar/conduits/calendar/calendar-conduit.c:1345
-#: calendar/conduits/todo/todo-conduit.c:887
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "No se pudo inicializar wombat"
 
-#: addressbook/conduit/address-conduit.c:1409
-#: addressbook/conduit/address-conduit.c:1412
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr "No se pudo leer el bloque de la aplicación de la Agenda del Pilot"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Un control Bonobo para una ventana de dirección."
+msgid "Configure access to LDAP directory servers here"
+msgstr "Configurar aquí el acceso a los servidores de directorios LDAP"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Un control Bonobo para mostrar una dirección."
+msgid "Directory Servers"
+msgstr "Servidores de directorio"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Un control Bonobo de ejemplo que muestra una agenda."
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Visor de minitarjetas de la agenda de Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr ""
-"Control de configuración para los Almacenes de la Libreta de Evolution"
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Interfaz de Evolution de selección de nombre de la agenda."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Configurar aquí el acceso a los servidores de directorios LDAP"
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Visor de minitarjetas de la agenda de Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control que muestra minitarjetas de direcciones en Evolution."
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Visor de minitarjetas de la agenda de Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "Servidores de directorio"
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Visor de minitarjetas de la agenda de Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Visor de minitarjetas de la agenda de Evolution"
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Componente de Prueba de Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Componente de Evolution para manejar contactos."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Factory for the controls exported by the Evolution Addressbook"
-msgstr ""
-"Fábrica para los controles exportados por la Libreta de Direcciones de "
-"Evolution."
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visor de minitarjetas de la agenda de Evolution"
 
 #: addressbook/gui/component/addressbook-component.c:76
 #: addressbook/gui/component/addressbook-component.c:605
@@ -791,7 +798,7 @@ msgstr "Esta consulta no se completó con éxito"
 
 #. All, unmatched, separator
 #: addressbook/gui/component/addressbook.c:1089
-#: calendar/gui/cal-search-bar.c:352
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
@@ -804,46 +811,46 @@ msgstr "La URI que mostrará el visor de carpetas"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: addressbook/gui/component/e-address-popup.c:472
+#: addressbook/gui/component/e-address-popup.c:478
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "Correo electrónico principal"
 
-#: addressbook/gui/component/e-address-popup.c:608
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Seleccione una acción"
 
-#: addressbook/gui/component/e-address-popup.c:615
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Crear un contacto nuevo «%s»"
 
-#: addressbook/gui/component/e-address-popup.c:631
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Añadir dirección al contacto existente «%s»"
 
-#: addressbook/gui/component/e-address-popup.c:913
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Consultando la agenda..."
 
-#: addressbook/gui/component/e-address-popup.c:997
+#: addressbook/gui/component/e-address-popup.c:998
 #: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Editar información del contacto"
 
-#: addressbook/gui/component/e-address-popup.c:1027
+#: addressbook/gui/component/e-address-popup.c:1028
 #: addressbook/gui/component/e-address-widget.c:428
-#: addressbook/gui/component/select-names/e-select-names-popup.c:479
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Añadir a contactos"
 
-#: addressbook/gui/component/e-address-popup.c:1051
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Combinar direcciones de correo"
 
@@ -977,7 +984,7 @@ msgid "LDAP Configuration Assistant"
 msgstr "Asistente de configuración LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Nunca"
 
@@ -987,14 +994,14 @@ msgid ""
 "(Secure Sockets Layer)\n"
 "and TLS (Transport Layer Security) protocols are used by some servers to "
 "cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses these "
-"protocols."
+"your connection. Ask your system administrator if your LDAP server uses "
+"these protocols."
 msgstr ""
 "Ahora, debe especificar cómo quiere conectar al servidor LDAP. Algunos "
 "servidores usan los protocolos SSL (Secure Sockets Layer)\n"
 "y TLS (Transport Layer Security)\n"
-"para proteger criptográficamente la conexión. Pregunte a su administrador "
-"de sistemas si sus servidores LDAP usan estos protocolos."
+"para proteger criptográficamente la conexión. Pregunte a su administrador de "
+"sistemas si sus servidores LDAP usan estos protocolos."
 
 #: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
@@ -1006,8 +1013,8 @@ msgstr "Ámbito de bú_squeda: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:35
-#: calendar/gui/calendar-model.c:1975 calendar/gui/e-day-view.c:1683
-#: calendar/gui/e-week-view.c:1229
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 msgid "Searching"
 msgstr "Buscando"
 
@@ -1035,11 +1042,11 @@ msgid ""
 "is already\n"
 "secure."
 msgstr ""
-"Seleccionar esta opción significa que Evolution sólo intentará usar "
-"SSL/TLS si está en un\n"
+"Seleccionar esta opción significa que Evolution sólo intentará usar SSL/TLS "
+"si está en un\n"
 "entorno inseguro. Por ejemplo, si usted y su servidor LDAP están tras un "
-"cortafuegos en el trabajo, entonces Evolution no necesita usar SSL/TLS porque "
-"su conexión ya es segura."
+"cortafuegos en el trabajo, entonces Evolution no necesita usar SSL/TLS "
+"porque su conexión ya es segura."
 
 #: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
@@ -1098,21 +1105,22 @@ msgstr "Bases de Búsqueda Soportadas"
 
 #: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and your "
-"log in\n"
+"The first step in configuring an LDAP server is to provide its name, and "
+"your log in\n"
 "information. Please ask your system administrator if you are unsure of this "
 "information."
 msgstr ""
-"El primer paso en configurar un servidor LDAP es proporcionar su nombre, y su "
-"información\n"
+"El primer paso en configurar un servidor LDAP es proporcionar su nombre, y "
+"su información\n"
 "de inicio de sesión. Por favor pregunte a su administrador de sistemas si no "
 "está seguro de esta información."
 
 #: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
-"The options on this page control how many entries should be included in your\n"
-"searches, and how long a search should take. Ask your system administrator if "
-"you\n"
+"The options on this page control how many entries should be included in "
+"your\n"
+"searches, and how long a search should take. Ask your system administrator "
+"if you\n"
 "need to change these options."
 msgstr ""
 "Las opciones de esta página controlan cómo muchas entradas deberían ser\n"
@@ -1136,17 +1144,17 @@ msgstr ""
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
-"directory tree. A search scope of \"sub\" will include all entries below your "
-"search base.\n"
+"directory tree. A search scope of \"sub\" will include all entries below "
+"your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
 "your base.\n"
 msgstr ""
-"El ámbito de búsqueda define hasta qué profundidad desea que la búsqueda "
-"se extienda\n"
+"El ámbito de búsqueda define hasta qué profundidad desea que la búsqueda se "
+"extienda\n"
 "a lo largo de un árbol de directorios. Un ámbito de búsqueda de «sub» "
 "incluirá todas las\n"
-"entradas por debajo su base de búsqueda. Un ámbito de «uno» sólo "
-"incluirá las entradas \n"
+"entradas por debajo su base de búsqueda. Un ámbito de «uno» sólo incluirá "
+"las entradas \n"
 "un nivel bajo su base.\n"
 
 #: addressbook/gui/component/ldap-config.glade.h:66
@@ -1164,30 +1172,32 @@ msgstr ""
 "\n"
 "Añadir un servidor LDAP nuevo requiere algo de información especializada "
 "sobre\n"
-"el servidor. Por favor, contacte con su administrador de sistemas si necesita "
-"ayuda\n"
+"el servidor. Por favor, contacte con su administrador de sistemas si "
+"necesita ayuda\n"
 "encontrando esta información."
 
 #: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
-"Este es el nombre completo del servidor LDAP. Por ejemplo, "
-"«ldap.micompañia.com»."
+"Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap.micompañia."
+"com»."
 
 #: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\ntoo large will slow down your addressbook."
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
+"too large will slow down your addressbook."
 msgstr ""
 "Este es el máximo número de entradas a descargar.  Si pone este número "
 "demasiado alto ralentizará su agenda."
 
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
-"This is the method evolution will use to authenticate you.  Note that setting "
-"this to \"Email Address\" requires anonymous access to your ldap server."
+"This is the method evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your ldap "
+"server."
 msgstr ""
 "Este es el método que usará Evolution para autenticarse.  Note que "
 "configurarlo como «Dirección de Correo» requiere acceso anónimo a su "
@@ -1204,8 +1214,9 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\nlist of standard ports has been provided. Ask your system administrator\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
+"list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
 "Este es el puerto del servidor LDAP al que Evolution intentará conectarse. "
@@ -1299,47 +1310,36 @@ msgid "searching-tab"
 msgstr "búsqueda"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
 msgstr "Interfaz de Evolution de selección de nombre de la agenda."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Fábrica para la interfaz de selección de nombre de la Agenda"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Eliminar todo"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:162
-#: addressbook/gui/component/select-names/e-select-names.c:693
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
 #: composer/e-msg-composer-attachment-bar.c:502
 #: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Eliminar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:177
-msgid "Remove All"
-msgstr "Eliminar todo"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:201
-msgid "Send HTML Mail?"
-msgstr "¿Enviar correo en HTML?"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:300
-msgid "View Contact Info"
-msgstr "Ver información del contacto"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:399
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr "Ver lista de contactos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:417
-msgid "Unnamed Contact List"
-msgstr "Lista de contactos anónima"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+msgid "View Contact Info"
+msgstr "Ver información del contacto"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:434
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d no mostrado)"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
+msgid "Send HTML Mail?"
+msgstr "¿Enviar correo en HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:500
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr "Contactos Anónimos"
 
@@ -1348,11 +1348,11 @@ msgstr "Contactos Anónimos"
 msgid "Source"
 msgstr "Fuente"
 
-#: addressbook/gui/component/select-names/e-select-names.c:506
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionas contactos de la Agenda"
 
-#: addressbook/gui/component/select-names/e-select-names.c:649
+#: addressbook/gui/component/select-names/e-select-names.c:648
 msgid "Find contact in"
 msgstr "Encontrar contacto en"
 
@@ -1482,7 +1482,7 @@ msgstr "Prefiere recibir el correo como _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: calendar/gui/dialogs/alarm-page.glade.h:10
 #: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3575
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
 #: filter/filter.glade.h:15 mail/folder-browser.c:1783
 #: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
 #: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
@@ -1521,10 +1521,10 @@ msgstr "Dirección de la página _web:"
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
-#: addressbook/gui/widgets/e-minicard-label.c:151
-#: addressbook/gui/widgets/e-minicard-view-widget.c:118
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:473
-#: addressbook/gui/widgets/e-minicard.c:179
+#: addressbook/gui/widgets/e-minicard.c:183
 msgid "Editable"
 msgstr "Editable"
 
@@ -2554,7 +2554,7 @@ msgstr "Zimbabwe"
 #: addressbook/gui/widgets/e-addressbook-model.c:304
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:104
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:459
 msgid "Book"
 msgstr "Libro"
@@ -2562,7 +2562,7 @@ msgstr "Libro"
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
 #: addressbook/gui/widgets/e-minicard-widget.c:93
-#: addressbook/gui/widgets/e-minicard.c:186
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr "Tarjeta"
 
@@ -2864,7 +2864,7 @@ msgstr "%d tarjetas"
 #: addressbook/gui/widgets/e-addressbook-model.c:311
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:111
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:466
 msgid "Query"
 msgstr "Consulta"
@@ -2879,20 +2879,21 @@ msgstr "Modelo"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:105
-#: addressbook/gui/widgets/e-minicard.c:515
+#: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Error modificando tarjeta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Éxito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:522 shell/e-shell.c:2072
-#: shell/e-storage.c:602 shell/evolution-shell-component.c:1202
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -2901,7 +2902,7 @@ msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -2918,7 +2919,7 @@ msgid "Protocol not supported"
 msgstr "Protocolo no implementado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1176
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
 #: camel/camel-service.c:737 camel/camel-service.c:779
@@ -3113,7 +3114,7 @@ msgid "Delete"
 msgstr "Borrar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:904
-#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 msgid "Current View"
 msgstr "Vista actual"
 
@@ -3217,38 +3218,38 @@ msgstr "y una tarjeta más."
 msgid "Save in addressbook"
 msgstr "Guardar en la agenda de direcciones"
 
-#: addressbook/gui/widgets/e-minicard-label.c:102
-#: addressbook/gui/widgets/e-minicard.c:142
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
 msgid "Width"
 msgstr "Ancho:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:109
-#: addressbook/gui/widgets/e-minicard.c:149
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
 msgid "Height"
 msgstr "Alto:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:116
-#: addressbook/gui/widgets/e-minicard.c:157
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
 msgid "Has Focus"
 msgstr "Tiene el foco"
 
-#: addressbook/gui/widgets/e-minicard-label.c:123
+#: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Campo"
 
-#: addressbook/gui/widgets/e-minicard-label.c:130
+#: addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Nombre del campo"
 
-#: addressbook/gui/widgets/e-minicard-label.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Modelo del texto"
 
-#: addressbook/gui/widgets/e-minicard-label.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Longitud máx. del campo"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Ancho de columna"
 
@@ -3280,11 +3281,11 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: addressbook/gui/widgets/e-minicard.c:165
+#: addressbook/gui/widgets/e-minicard.c:169
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: addressbook/gui/widgets/e-minicard.c:172
+#: addressbook/gui/widgets/e-minicard.c:176
 msgid "Has Cursor"
 msgstr "Tiene el cursor"
 
@@ -3614,7 +3615,7 @@ msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/calendar-model.c:1704
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
@@ -3633,72 +3634,74 @@ msgstr "Baja"
 msgid "Undefined"
 msgstr "Sin definir"
 
-#: calendar/conduits/calendar/calendar-conduit.c:208
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Dividir eventos de días múltiples:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1291
-#: calendar/conduits/todo/todo-conduit.c:832
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Error mientras me comunicaba con el servidor de agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1442
-#: calendar/conduits/calendar/calendar-conduit.c:1445
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "No se pudo leer información de la aplicación de calendario del Pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:208
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Prioridad predeterminada:"
 
-#: calendar/conduits/todo/todo-conduit.c:956
-#: calendar/conduits/todo/todo-conduit.c:959
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "No se pudo leer los datos de la aplicación ToDo del Pilot"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Un control bonobo que muestra una lista de tareas."
+msgid "Calendar and Tasks"
+msgstr "Calendario y Tareas"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Un control bonobo de ejemplo que muestra un agenda."
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure su zona horaria, Calendario y Lista de Tareas aquí"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
 msgstr "Calendario y Tareas"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Control de configuración del Calendario de Evolution."
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Componente para mostrar carpetas de correo de Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure su zona horaria, Calendario y Lista de Tareas aquí"
+msgid "Evolution Calendar configuration control"
+msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
 msgstr "Visor de calendario iTip/iMip de Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Componente de Evolution para manejar el calendario"
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Visor de calendario iTip/iMip de Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Fábrica para objetos de Evolution Calendar."
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Visor de calendario iTip/iMip de Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr ""
-"Fábrica para centralizar el componente del editor de diálogos del agenda"
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Alarma de Evolution"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Alarm notification service"
-msgstr "Servicio de notificación de alarmas"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:2
-msgid "Factory for the alarm notification service"
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
 msgstr "Fábrica para el servicio de aviso de notificación"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
@@ -3788,8 +3791,7 @@ msgstr "No se pudo inicializar gnome-vfs"
 
 #: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
-msgstr ""
-"No se pudo crear la fábrica del servicio de la alarma de notificación"
+msgstr "No se pudo crear la fábrica del servicio de la alarma de notificación"
 
 #: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
@@ -3803,7 +3805,7 @@ msgstr "La descripción contiene"
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/cal-search-bar.c:356 mail/mail-ops.c:1106
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr "No coincidente"
 
@@ -3814,7 +3816,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
-#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:322
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %d de %b de %Y"
 
@@ -3832,7 +3834,7 @@ msgstr "%d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:432
-#: calendar/gui/e-week-view-main-item.c:330 calendar/gui/print.c:1513
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d de %B"
 
@@ -3862,7 +3864,7 @@ msgstr "Carpeta pública conteniendo citas y eventos"
 
 #: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
 #: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
-#: calendar/importers/icalendar-importer.c:617
+#: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
 #: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
@@ -3929,12 +3931,12 @@ msgstr "Cita de todo el _día"
 msgid "Create a new all-day appointment"
 msgstr "Crear una nueva cita para todo el día"
 
-#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:956
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
 #: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:958
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
 #: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Confidencial"
@@ -3959,37 +3961,37 @@ msgstr "E"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1126
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
 #: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "Libre"
 
 #: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
-#: calendar/gui/e-meeting-time-sel.c:408
-#: shell/evolution-shell-component.c:1187
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:742 calendar/gui/calendar-model.c:1170
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "Sin comenzar"
 
-#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1172
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "En proceso"
 
-#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1174
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "Terminado"
 
-#: calendar/gui/calendar-model.c:1028
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4000,32 +4002,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1168 calendar/gui/dialogs/meeting-page.c:322
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2031
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
 #: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
 #: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
 #: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "Ninguno"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Repetición"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Asignado"
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
 #: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
 #: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr "Sí"
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
 #: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "No"
@@ -4063,31 +4065,31 @@ msgstr "Permiso denegado para abrir el calendario"
 msgid "Could not open the folder in '%s'"
 msgstr "No se pudo abrir la carpeta en «%s»"
 
-#: calendar/gui/control-factory.c:163
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrará la agenda"
 
-#: calendar/gui/control-factory.c:170
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "El tipo de vista a mostrar"
 
-#: calendar/gui/dialogs/alarm-options.c:473
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Opciones de los avisos audibles"
 
-#: calendar/gui/dialogs/alarm-options.c:482
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Opciones de los avisos de mensajes"
 
-#: calendar/gui/dialogs/alarm-options.c:491
+#: calendar/gui/dialogs/alarm-options.c:438
 msgid "Email Alarm Options"
 msgstr "Opciones de los avisos por correo"
 
-#: calendar/gui/dialogs/alarm-options.c:500
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Opciones de los avisos de programas"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Opciones de avisos desconocidos"
 
@@ -4128,14 +4130,19 @@ msgid "days"
 msgstr "días"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr "diálogo1"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "extra tiempo cada"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12 filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutos"
 
@@ -4200,7 +4207,7 @@ msgstr "fin de la cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4380,7 +4387,7 @@ msgid "_Fri"
 msgstr "_Vie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_General"
 
@@ -4450,8 +4457,8 @@ msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
-"La entrada del diario que está borrando está publicada, ¿Quiere que envíe "
-"un aviso de cancelación?"
+"La entrada del diario que está borrando está publicada, ¿Quiere que envíe un "
+"aviso de cancelación?"
 
 #: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
@@ -4494,8 +4501,7 @@ msgstr "Esta entrada del diario ha cambiado."
 #: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s  Ha realizado cambios. ¿Olvido estos cambios y actualizo el editor?"
+msgstr "%s  Ha realizado cambios. ¿Olvido estos cambios y actualizo el editor?"
 
 #: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
@@ -4568,7 +4574,7 @@ msgstr "Sin resumen"
 
 #: calendar/gui/dialogs/comp-editor.c:1230
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
-#: calendar/gui/e-week-view.c:3776 composer/e-msg-composer.c:1159
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr "Guardar como..."
 
@@ -4662,19 +4668,19 @@ msgstr "Planificación"
 msgid "Meeting"
 msgstr "Reunión"
 
-#: calendar/gui/dialogs/event-page.c:654 calendar/gui/dialogs/task-page.c:554
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
 msgid "Start date is wrong"
 msgstr "La fecha de inicio está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:664
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "La fecha de finalización  está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:687
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "La hora de inicio está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:694
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "La  hora de finalización  está equivocada"
 
@@ -4731,15 +4737,10 @@ msgid "Su_mmary:"
 msgstr "Resu_men:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Contactos..."
-
-#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
@@ -4799,7 +4800,7 @@ msgid "Member"
 msgstr "Miembro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4821,7 +4822,7 @@ msgid "_Change Organizer"
 msgstr "_Cambiar organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr "_Invitar a otros..."
 
@@ -4837,8 +4838,7 @@ msgstr "Está modificando una tarea que se repite, ¿qué quiere modificar?"
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
-"Está modificando una entrada del diario que se repite, ¿qué quiere "
-"modificar?"
+"Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
@@ -4966,8 +4966,7 @@ msgstr "La información de la reunión ha sido creada. ¿Desea enviarla?"
 
 #: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-"La información de la reunión ha cambiado. ¿Enviar versión actualizada?"
+msgstr "La información de la reunión ha cambiado. ¿Enviar versión actualizada?"
 
 #: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
@@ -4976,8 +4975,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
-msgstr ""
-"La información de la tarea ha cambiado. ¿Enviar versión actualizada?"
+msgstr "La información de la tarea ha cambiado. ¿Enviar versión actualizada?"
 
 #: calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
@@ -5024,7 +5022,7 @@ msgstr "Asignación"
 msgid "Due date is wrong"
 msgstr "La fecha de Pendientes es errónea"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1104
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
@@ -5034,6 +5032,10 @@ msgstr "Descripción:"
 msgid "Sta_rt Date:"
 msgstr "Fecha de ini_cio:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Contactos..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Fecha _de vencimiento:"
@@ -5132,56 +5134,67 @@ msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
 #: calendar/gui/e-calendar-table.c:415
+#, c-format
 msgid "0%"
 msgstr "0%"
 
 #: calendar/gui/e-calendar-table.c:416
+#, c-format
 msgid "10%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:417
+#, c-format
 msgid "20%"
 msgstr "20%"
 
 #: calendar/gui/e-calendar-table.c:418
+#, c-format
 msgid "30%"
 msgstr "30%"
 
 #: calendar/gui/e-calendar-table.c:419
+#, c-format
 msgid "40%"
 msgstr "40%"
 
 #: calendar/gui/e-calendar-table.c:420
+#, c-format
 msgid "50%"
 msgstr "50%"
 
 #: calendar/gui/e-calendar-table.c:421
+#, c-format
 msgid "60%"
 msgstr "60%"
 
 #: calendar/gui/e-calendar-table.c:422
+#, c-format
 msgid "70%"
 msgstr "70%"
 
 #: calendar/gui/e-calendar-table.c:423
+#, c-format
 msgid "80%"
 msgstr "80%"
 
 #: calendar/gui/e-calendar-table.c:424
+#, c-format
 msgid "90%"
 msgstr "90%"
 
 #: calendar/gui/e-calendar-table.c:425
+#, c-format
 msgid "100%"
 msgstr "100%"
 
 #: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
-#: calendar/gui/e-week-view.c:1906
+#: calendar/gui/e-week-view.c:1910
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
 #: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
-#: calendar/gui/e-week-view.c:3557 mail/folder-browser.c:1756
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
 #: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
@@ -5191,7 +5204,7 @@ msgid "_Save as..."
 msgstr "_Guardar como..."
 
 #: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
-#: calendar/gui/e-week-view.c:3532 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
@@ -5199,21 +5212,21 @@ msgid "_Print..."
 msgstr "Im_primir..."
 
 #: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
-#: calendar/gui/e-week-view.c:3564 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
 #: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
-#: calendar/gui/e-week-view.c:3565 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copiar"
 
 #: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
-#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3536
-#: calendar/gui/e-week-view.c:3566 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5240,7 +5253,7 @@ msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
 #: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
-#: calendar/gui/e-week-view.c:4265
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
@@ -5283,7 +5296,7 @@ msgid "Start Date"
 msgstr "Fecha de inicio"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:56 shell/e-shell.c:747
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Resumen"
@@ -5323,14 +5336,14 @@ msgstr "%02i divisiones por minuto"
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
-#: calendar/gui/e-week-view-main-item.c:313 calendar/gui/print.c:1529
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
-#: calendar/gui/e-week-view-main-item.c:336
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr "%d de %b"
 
@@ -5350,15 +5363,15 @@ msgstr "pm"
 msgid "New _Appointment"
 msgstr "Nueva cit_a"
 
-#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "Nuevo _evento para todo el día"
 
-#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3527
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 msgid "New Meeting"
 msgstr "Nueva reunión"
 
-#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3528
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "Tarea nueva"
 
@@ -5366,47 +5379,47 @@ msgstr "Tarea nueva"
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3543
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3547
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar la información de disponibilidad"
 
-#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3551
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Configuración..."
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
 #: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3570
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 msgid "_Schedule Meeting..."
 msgstr "Concertar una _reunión"
 
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar"
 
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3576
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta ocurrencia _movible"
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3577
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _ocurrencia"
 
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3578
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las ocurrencias"
 
@@ -5525,31 +5538,31 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ninguna<i>"
 
-#: calendar/gui/e-itip-control.c:1058
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Lugar:"
 
-#: calendar/gui/e-itip-control.c:1072
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Estado:"
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
 #: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
-#: calendar/gui/itip-utils.c:413
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:1081 calendar/gui/itip-utils.c:416
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: calendar/gui/e-itip-control.c:1085 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
-#: calendar/gui/itip-utils.c:419 calendar/gui/itip-utils.c:445
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Rechazado"
 
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
 #: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
 #: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
 #: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
@@ -5561,300 +5574,299 @@ msgstr "Rechazado"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/e-itip-control.c:1144 calendar/gui/e-itip-control.c:1172
-#: calendar/gui/e-itip-control.c:1198 calendar/gui/e-itip-control.c:1211
-#: calendar/gui/e-itip-control.c:1224 calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 msgid "Choose an action:"
 msgstr "Elija una acción:"
 
-#: calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Actualizar"
 
-#: calendar/gui/e-itip-control.c:1146 calendar/gui/e-itip-control.c:1177
-#: calendar/gui/e-itip-control.c:1200 calendar/gui/e-itip-control.c:1213
-#: calendar/gui/e-itip-control.c:1226 calendar/gui/e-itip-control.c:1239
-#: shell/e-shell.c:2062 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Rechazar"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Enviar la última información"
 
-#: calendar/gui/e-itip-control.c:1238 calendar/gui/itip-utils.c:433
-#: shell/evolution-shell-component.c:1165 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ha publicado información de reunión."
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Información de reunió"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> solicita la presencia de %s en una reunión."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> solicita su presencia en una reunión."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Propuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desea apuntarse a una reunión existente."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Actualización de reunión"
 
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desea recibir la última información de la reunión."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Petición de actualización de la reunión"
 
-#: calendar/gui/e-itip-control.c:1345
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ha contestado a la petición de reunión."
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Respuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1353
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ha cancelado una reunión."
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Cancelación de reunión"
 
-#: calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1428
-#: calendar/gui/e-itip-control.c:1463
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reunión erróneo"
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ha publicado la información de la tarea."
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Información de la tarea"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pide a %s que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> le pide que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
-#: calendar/gui/e-itip-control.c:1399
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desea añadirse a una tarea existente."
 
-#: calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1404
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> quiere recibir la última información de la tarea."
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Petición de actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1412
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ha contestado a una asignación de tarea."
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: calendar/gui/e-itip-control.c:1420
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: calendar/gui/e-itip-control.c:1421
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Cancelación de tarea"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea erróneo"
 
-#: calendar/gui/e-itip-control.c:1448
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ha publicado la información de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1449
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1453
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pide su información de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1454
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Petición de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1458
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ha contestado a una petición de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1464
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad erróneo"
 
-#: calendar/gui/e-itip-control.c:1540
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr "El mensaje no parece estar formado correctamente"
 
-#: calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje sólo contiene peticiones no soportadas."
 
-#: calendar/gui/e-itip-control.c:1634 calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un agenda de mensaje válido"
 
-#: calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: calendar/gui/e-itip-control.c:1906 calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr "El objeto es inválido y no puede ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 msgid "There was an error on the CORBA system\n"
 msgstr "Hubo un error en el sistema CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 msgid "Object could not be found\n"
 msgstr "El objeto no pudo encontrarse\n"
 
-#: calendar/gui/e-itip-control.c:1915
+#: calendar/gui/e-itip-control.c:1916
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "No tiene permiso para actualizar el calendario\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "El archivo del calendario no pudo ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1950 calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado de asistencia no puede ser actualizado porque no existe el elemento"
 
-#: calendar/gui/e-itip-control.c:1971
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
-"Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
+msgstr "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
 
-#: calendar/gui/e-itip-control.c:1983
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "El estado de asistencia no pudo ser actualizado a causa de un estado "
 "inválido\n"
 
-#: calendar/gui/e-itip-control.c:2007
+#: calendar/gui/e-itip-control.c:2008
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "No tiene permiso para actualizar el calendario\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "El estado de asistencia no pudo ser actualizado.\n"
 
-#: calendar/gui/e-itip-control.c:2048
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Eliminación terminada"
 
-#: calendar/gui/e-itip-control.c:2078 calendar/gui/e-itip-control.c:2128
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: calendar/gui/e-itip-control.c:2080 calendar/gui/e-itip-control.c:2132
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo ser enviado.\n"
 
-#: calendar/gui/e-itip-control.c:2205
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Seleccionar carpeta de Calendario"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Seleccionar carpeta de Tareas"
 
@@ -5957,7 +5969,7 @@ msgid "Needs Action"
 msgstr "Necesita acción"
 
 #: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
-#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:407
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr "Tentativa"
 
@@ -5973,14 +5985,14 @@ msgstr "En proceso"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2080
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2113 e-util/e-time-utils.c:189
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
 #: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5992,63 +6004,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:409 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:410
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Sin información"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Opciones"
 
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Mostrar quitando _ampliación"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Actualizar Libre/Ocupado"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:535
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr "_Autoseleccionar"
 
-#: calendar/gui/e-meeting-time-sel.c:549
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr "_Todas las personas y los recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Todas las _personas y un recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "Personas _requeridas"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:630
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Hora de _inicio de la reunión:"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Hora de _fin de la reunión:"
 
@@ -6094,7 +6106,7 @@ msgstr "Borrando los objetos seleccionados..."
 msgid "Expunging"
 msgstr "Comprimiendo"
 
-#: calendar/gui/e-week-view.c:3525
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Nueva cit_a..."
 
@@ -6200,57 +6212,57 @@ msgstr "Octubre"
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/itip-utils.c:262 calendar/gui/itip-utils.c:310
-#: calendar/gui/itip-utils.c:342
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Es necesario por lo menos un asistente"
 
-#: calendar/gui/itip-utils.c:385 calendar/gui/itip-utils.c:494
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "Información del evento"
 
-#: calendar/gui/itip-utils.c:387 calendar/gui/itip-utils.c:496
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "Información de la tarea"
 
-#: calendar/gui/itip-utils.c:389 calendar/gui/itip-utils.c:498
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "Información de la entrada de diario"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "Información de disponibilidad"
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Información de calendario"
 
-#: calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Actualizado"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Regenerar"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Contra-propuesta"
 
-#: calendar/gui/itip-utils.c:512
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de disponibilidad (de %s a %s)"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: calendar/gui/itip-utils.c:672
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un asistente del evento."
 
@@ -6350,7 +6362,7 @@ msgstr "Contactos: "
 
 #: calendar/gui/print.c:2533 calendar/gui/print.c:2619
 #: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:617
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "Vista previa"
 
@@ -6391,26 +6403,38 @@ msgid "SMTWTFS"
 msgstr "DLMXJVS"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Fábrica para importar archivos iCalendar en Evolution."
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Visor de calendario iTip/iMip de Evolution"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Importa archivos iCalendar en Evolution."
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Visor de calendario iTip/iMip de Evolution"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Importa archivos vCalendar en Evolution."
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Visor de calendario iTip/iMip de Evolution"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Mensaje del calendario"
 
-#: calendar/importers/icalendar-importer.c:391
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
 msgstr "¡¡Recuerde!!"
 
-#: calendar/importers/icalendar-importer.c:610
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Eventos de calendario"
 
-#: calendar/importers/icalendar-importer.c:635
+#: calendar/importers/icalendar-importer.c:663
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6418,7 +6442,7 @@ msgstr ""
 "Evolution ha encontrado archivos de GNOME Calendar.\n"
 "¿Quiere importarlos a Evolution?"
 
-#: calendar/importers/icalendar-importer.c:642
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -6501,11 +6525,10 @@ msgstr "contains? espera que el argumento 2 sea una cadena"
 
 #: calendar/pcs/query.c:734
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
-"contains? espera que el argumento 1 sea «any», «summary» ó "
-"«description»"
+"contains? espera que el argumento 1 sea «any», «summary» ó «description»"
 
 #: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
@@ -8307,8 +8330,7 @@ msgstr "Cancelado"
 
 #: camel/camel-gpg-context.c:798
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr ""
-"Falló al desbloquear la clave secreta: se dieron 3 contraseñas falsas."
+msgstr "Falló al desbloquear la clave secreta: se dieron 3 contraseñas falsas."
 
 #: camel/camel-gpg-context.c:804
 #, c-format
@@ -8355,8 +8377,8 @@ msgstr "Falló al ejecutar gpg."
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
-"No se pudo verificar la firma del mensaje: no pude crear un archivo temporal: "
-"%s"
+"No se pudo verificar la firma del mensaje: no pude crear un archivo "
+"temporal: %s"
 
 #: camel/camel-lock-client.c:111
 #, c-format
@@ -8547,11 +8569,11 @@ msgstr "DIGEST-MD5"
 
 #: camel/camel-sasl-digest-md5.c:48
 msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, if "
-"the server supports it."
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
 msgstr ""
-"Esta opción conectará con el servidor usando una clave segura DIGEST-MD5, "
-"si el servidor lo implementa."
+"Esta opción conectará con el servidor usando una clave segura DIGEST-MD5, si "
+"el servidor lo implementa."
 
 #: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
@@ -8564,8 +8586,7 @@ msgstr "Reto del servidor no válido\n"
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
-"El reto del servidor contiene una valor «Calidad de Protección» no "
-"válido\n"
+"El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -8585,10 +8606,8 @@ msgid "GSSAPI"
 msgstr "GSSAPI"
 
 #: camel/camel-sasl-gssapi.c:50
-msgid ""
-"This option will connect to the server using Kerberos 5 authentication."
-msgstr ""
-"Esta opción conectará con el servidor usando autenticación Kerberos 5."
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr "Esta opción conectará con el servidor usando autenticación Kerberos 5."
 
 #: camel/camel-sasl-gssapi.c:148
 msgid ""
@@ -8607,8 +8626,8 @@ msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
-"El parámetro target_name proporcionado contenía un tipo de nombre inválido "
-"o no soportado."
+"El parámetro target_name proporcionado contenía un tipo de nombre inválido o "
+"no soportado."
 
 #: camel/camel-sasl-gssapi.c:160
 msgid ""
@@ -8673,10 +8692,8 @@ msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:43
-msgid ""
-"This option will connect to the server using Kerberos 4 authentication."
-msgstr ""
-"Esta opción conectará con el servidor usando autenticación Kerberos 4."
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr "Esta opción conectará con el servidor usando autenticación Kerberos 4."
 
 #: camel/camel-sasl-kerberos4.c:162
 #, c-format
@@ -9236,7 +9253,7 @@ msgstr "Comprobando si hay correo nuevo"
 msgid "Check for new messages in all folders"
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1185
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -9255,8 +9272,7 @@ msgstr "Espacio de nombres"
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
-"Aplicar filtros a los mensajes nuevos en el buzón de entrada de este "
-"servidor"
+"Aplicar filtros a los mensajes nuevos en el buzón de entrada de este servidor"
 
 #: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
@@ -9273,8 +9289,7 @@ msgid "Password"
 msgstr "Contraseña"
 
 #: camel/providers/imap/camel-imap-provider.c:82
-msgid ""
-"This option will connect to the IMAP server using a plaintext password."
+msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Conectará con el servidor IMAP usando una contraseña de texto plano"
 
 #: camel/providers/imap/camel-imap-store.c:457
@@ -9675,8 +9690,7 @@ msgstr "No se pudo abrir la carpeta: %s: %s"
 #: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-"Análisis erróneo del correo cerca de la posición %ld en la carpeta %s"
+msgstr "Análisis erróneo del correo cerca de la posición %ld en la carpeta %s"
 
 #: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
@@ -9717,8 +9731,7 @@ msgstr "No se pudo cambiar el nombre a la carpeta: %s"
 #: camel/providers/local/camel-mbox-summary.c:843
 #: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-"Resumen y carpeta no concuerdan, incluso después de una sincronización"
+msgstr "Resumen y carpeta no concuerdan, incluso después de una sincronización"
 
 #: camel/providers/local/camel-mbox-summary.c:777
 #: camel/providers/local/camel-spool-summary.c:334
@@ -9964,14 +9977,13 @@ msgid ""
 "is the only option supported by many POP servers."
 msgstr ""
 "Esta opción es para conectar con servidores POP usando una contraseña en "
-"texto plano. Esta es la única opción implementada por muchos servidores "
-"POP."
+"texto plano. Esta es la única opción implementada por muchos servidores POP."
 
 #: camel/providers/pop3/camel-pop3-provider.c:81
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that claim "
-"to support it."
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
 msgstr ""
 "Esta opción es para conectar con servidores POP usando una contraseña "
 "cifrada por medio del protocolo APOP. Esto no funcionará para todos los "
@@ -10035,7 +10047,7 @@ msgstr ""
 "No se pudo conectar con el servidor POP %s.\n"
 "Error al enviar la contraseña: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:623
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "No existe la carpeta «%s»."
@@ -10170,8 +10182,7 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
-"Acción solicitada no realizada: excedió la capacidad de almacenamiento"
+msgstr "Acción solicitada no realizada: excedió la capacidad de almacenamiento"
 
 #: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
@@ -10347,8 +10358,8 @@ msgstr "DATA respondió con un error"
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
-"Expiró el tiempo para el envío de DATA: terminación del mensaje: %s: "
-"correo no enviado"
+"Expiró el tiempo para el envío de DATA: terminación del mensaje: %s: correo "
+"no enviado"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
@@ -10509,11 +10520,11 @@ msgstr "Publicar destino"
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
-#: composer/e-msg-composer.c:530
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "No se pudo crear un contexto de firma PGP."
 
-#: composer/e-msg-composer.c:809
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10522,30 +10533,30 @@ msgstr ""
 "Error leyendo el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, ¿Sobreescribir?"
 
-#: composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:1213
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "No se pudo obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10554,7 +10565,7 @@ msgstr ""
 "No se pudo buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1270
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10563,7 +10574,7 @@ msgstr ""
 "No se pudo truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1279
+#: composer/e-msg-composer.c:1285
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10572,7 +10583,7 @@ msgstr ""
 "No se pudo copiar el descriptor de archivo:  %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10581,7 +10592,7 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1382
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10589,7 +10600,7 @@ msgstr ""
 "Ximian Evolution ha encontrado archivos no guardados de una sesión previa.\n"
 "¿Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1544
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10600,32 +10611,32 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1549
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Descartar cambios"
 
-#: composer/e-msg-composer.c:1553
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
-#: composer/e-msg-composer.c:1585
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1992
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "Firma"
 
-#: composer/e-msg-composer.c:2032 mail/mail-account-gui.c:1254
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr "Autogenerado"
 
-#: composer/e-msg-composer.c:2211 composer/e-msg-composer.c:2887
-#: composer/e-msg-composer.c:2888
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10633,7 +10644,7 @@ msgstr ""
 "No se pudo crear una ventana de composición:\n"
 "No se pudoactivar el control de selección de direcciones."
 
-#: composer/e-msg-composer.c:2945
+#: composer/e-msg-composer.c:2931
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10645,7 +10656,7 @@ msgstr ""
 "Por favor, asegúrese de que tiene la versión \n"
 "correcta de gtkhtml y libgtkthml instalada.\n"
 
-#: composer/e-msg-composer.c:3005
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10653,10 +10664,10 @@ msgstr ""
 "No se pudo crear una ventana de composición:\n"
 "No se pudoactivar el componente del editor HTML."
 
-#: composer/e-msg-composer.c:4018
+#: composer/e-msg-composer.c:4005
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be "
-"edited.)<b>"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
 msgstr ""
 "<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
 
@@ -10771,8 +10782,8 @@ msgstr "<b>Enviando correo</b>"
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests a "
-"receipt from you.</small>"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
 msgstr ""
 "<small>Esta página le permite elegir si quiere que se le notifique por medio "
 "de un recibo que el mensaje que envió se ha leído, y para especificar qué "
@@ -10831,11 +10842,11 @@ msgstr ""
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Recuerda esta contraseña"
 
-#: e-util/e-passwords.c:361
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Recordar esta clave durante el resto de esta sesión"
 
@@ -11058,31 +11069,31 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1280
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
 msgid "Important"
 msgstr "Importante"
 
 #. red
 #: filter/filter-label.c:122 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1281
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 msgid "Work"
 msgstr "Trabajo"
 
 #. orange
 #: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
-#: shell/e-config-upgrade.c:1282
+#: shell/e-config-upgrade.c:1281
 msgid "Personal"
 msgstr "Privado"
 
 #. forest green
 #: filter/filter-label.c:124 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1283
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 msgid "To Do"
 msgstr "Tareas pendientes"
 
 #. blue
 #: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
-#: shell/e-config-upgrade.c:1284
+#: shell/e-config-upgrade.c:1283
 msgid "Later"
 msgstr "Más tarde"
 
@@ -11187,7 +11198,7 @@ msgstr "hace"
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:24 mail/mail-config.glade.h:181
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
 msgid "seconds"
 msgstr "segundos"
 
@@ -11528,7 +11539,7 @@ msgid "Scanning %s"
 msgstr "Guardando %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:114
+#: importers/pine-importer.c:637 mail/component-factory.c:116
 #: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
 #: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
@@ -11672,59 +11683,68 @@ msgid "Composer Preferences"
 msgstr "Preferencias del Editor"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Control de configuración de tipografías de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Control de configuración para las cuentas de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Control de Configuración para el envío de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Control de configuración para el compositor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure las preferencias de correo incluyendo seguridad y visualización de "
 "mensajes, aquí"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Configure aquí la ortografía, firmas y la composición de mensajes."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure the fonts used by Evolution here"
 msgstr "Configure las fuentes usadas por Evolution aquí"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr "Configure sus cuentas de correo aquí"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Editor de cuentas de Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Compositor de correo de Evolution."
+
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Componente Evolution para manejar el correo."
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Compositor de correo de Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Compositor de correo de Evolution."
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Interfaz de configuración del correo"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Componente de correo del resumen de trabajo de Evolution."
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Componente para mostrar carpetas de correo de Evolution"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Componente para mostrar carpetas de correo de Evolution"
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Interfaz de configuración del correo"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr "Fábrica para los controles exportados por Evolution Mailer"
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Componente de correo del resumen de trabajo de Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
@@ -11738,43 +11758,39 @@ msgstr "Cuentas de correo"
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "Interfaz de configuración del correo"
-
-#: mail/component-factory.c:114
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Carpeta conteniendo correo"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Correo público"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Carpeta pública  conteniendo correo"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Papelera virtual"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Carpetas de papelera virtuales"
 
-#: mail/component-factory.c:144
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Esta carpeta no contiene mensajes."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Cambiar las propiedades de esta carpeta"
 
-#: mail/component-factory.c:816
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11782,7 +11798,7 @@ msgstr ""
 "Algunas de tus opciones de correo parece que están corruptas, por favor "
 "comprueba que todo está en orden."
 
-#: mail/component-factory.c:996
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "No ha definido un sistema para enviar el correo"
 
@@ -12011,21 +12027,37 @@ msgstr "Predeterminado"
 msgid "Getting Folder Information"
 msgstr "Obteniendo información de la carpeta"
 
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Compositor de correo de Evolution."
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Fábrica para importar archivos mbox a Evolution."
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Compositor de correo de Evolution."
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importa archivos mbox a Evolution."
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Compositor de correo de Evolution."
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Fábrica para importar mensajes de Outlook Express 4 a Evolution."
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importa archivos de Outlook Express 4 a Evolution."
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Compositor de correo de Evolution."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12046,8 +12078,8 @@ msgid ""
 "recoverable.  Please use this feature with care."
 msgstr ""
 "Nota: Cuando se convierte entre distintos formatos de buzón de correo, "
-"puede\nque un fallo (como la falta de disco) no sea recuperable "
-"automáticamente.\n"
+"puede\n"
+"que un fallo (como la falta de disco) no sea recuperable automáticamente.\n"
 "Por favor use esta opción con cuidado."
 
 #: mail/local-config.glade.h:7
@@ -12071,7 +12103,7 @@ msgstr "No ha rellenado toda la información requerida."
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Hospedador:"
 
@@ -12079,7 +12111,7 @@ msgstr "_Hospedador:"
 msgid "User_name:"
 msgstr "_Nombre de usuario:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "R_uta:"
 
@@ -12096,12 +12128,12 @@ msgid "Don't delete"
 msgstr "No borrar"
 
 #: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr "Desactivar"
 
 #: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr "Habilitar"
 
@@ -12111,7 +12143,7 @@ msgid "[Default]"
 msgstr "[Predeterminada]"
 
 #: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:680 mail/mail-composer-prefs.c:836
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr "Habilitada"
 
@@ -12209,8 +12241,8 @@ msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
 msgstr ""
-"Está enviando un mensaje formateado en HTML. Por favor, asegúrese de que "
-"los siguientes destinatarios desean y son capaces de recibir  mensajes "
+"Está enviando un mensaje formateado en HTML. Por favor, asegúrese de que los "
+"siguientes destinatarios desean y son capaces de recibir  mensajes "
 "formateados en HTML:\n"
 
 #: mail/mail-callbacks.c:266
@@ -12370,33 +12402,33 @@ msgstr "Imprimir mensaje"
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresión del mensaje"
 
-#: mail/mail-callbacks.c:3146
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "¿Seguro que quiere abrir %d mensajes en ventanas separadas?"
 
-#: mail/mail-composer-prefs.c:225 mail/mail-composer-prefs.c:328
-#: mail/mail-config.c:1220
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
 msgid "Unnamed"
 msgstr "Sin nombre"
 
-#: mail/mail-composer-prefs.c:313
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr "Por favor especifique un nombre válido de guión"
 
-#: mail/mail-composer-prefs.c:369 mail/mail-composer-prefs.c:431
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
 msgid "[script]"
 msgstr " [guión]"
 
-#: mail/mail-composer-prefs.c:840
+#: mail/mail-composer-prefs.c:864
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: mail/mail-composer-prefs.c:882
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Añadir guión de firma"
 
-#: mail/mail-composer-prefs.c:902
+#: mail/mail-composer-prefs.c:926
 msgid "Signature(s)"
 msgstr "Firmas(s)"
 
@@ -12406,9 +12438,9 @@ msgstr "Identidad"
 
 #: mail/mail-config-druid.c:382
 msgid ""
-"Please enter your name and email address below. The \"optional\" fields below "
-"do not need to be filled in, unless you wish to include this information in "
-"email you send."
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Por favor escriba debajo su nombre y dirección de correo. Los campos  "
 "«opcionales» no hace falta que los rellene,\n"
@@ -12440,8 +12472,8 @@ msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Por favor escriba debajo la información acerca de cómo enviará su correo. "
-"Si no está seguro, pregúntele\n"
+"Por favor escriba debajo la información acerca de cómo enviará su correo. Si "
+"no está seguro, pregúntele\n"
 "a su administrador de sistemas o a su Proveedor de Servicios de Internet."
 
 #: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
@@ -12462,11 +12494,11 @@ msgstr ""
 "Por favor escriba un nombre para esta cuenta en el espacio de abajo.Este "
 "nombre sólo se usará para mostrar información."
 
-#: mail/mail-config.c:924
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: mail/mail-config.c:1002 mail/mail-config.c:1006
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
@@ -12616,8 +12648,7 @@ msgstr "No citar el mensaje original"
 
 #: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr ""
-"No _firmar las peticiones de reunión (para compatibilidad con Outlook)"
+msgstr "No _firmar las peticiones de reunión (para compatibilidad con Outlook)"
 
 #: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
@@ -12712,23 +12743,24 @@ msgid "Message Display"
 msgstr "Pantalla del mensaje"
 
 #: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "El mensaje contiene"
+
+#: mail/mail-config.glade.h:76
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Notificación de correo nuevo"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid ""
-"Note: you will not be prompted for a password until you connect for the first "
-"time"
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr "Nota: Se le pedirá una contraseña hasta que conecte por primera vez"
 
-#: mail/mail-config.glade.h:80
-msgid "On Screen fonts"
-msgstr "Fuentes en pantalla"
-
 #: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Información opcional"
@@ -12877,9 +12909,9 @@ msgid ""
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"Esta página permite configurar el comportamiento de la revisión "
-"ortográfica y el idioma. La lista de idiomas aquí refleja únicamente los "
-"idiomas para los cuales hay instalado un diccionario."
+"Esta página permite configurar el comportamiento de la revisión ortográfica "
+"y el idioma. La lista de idiomas aquí refleja únicamente los idiomas para "
+"los cuales hay instalado un diccionario."
 
 #: mail/mail-config.glade.h:125
 msgid ""
@@ -12964,102 +12996,108 @@ msgid "_Enable"
 msgstr "_Habilitar"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr "_Anchura fija:"
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "Nombre _completo:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "Correo en _HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_Identidad"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "Cargar imágenes si e_l remitente esta el la agenda de direcciones"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "Hacer de esta mi cuenta pre_determinada"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como leídos tras"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_No cargar nunca imágenes desde la red"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "T_ocar un archivo de sonido cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Preguntar al mandar mensajes en HTML a contactos que no los quieren"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pr_eguntar al mandar mensajes con el asunto vacío"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Recibiendo correo"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "Estilo de _respuesta:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "Volver a configuración p_redeterminada"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Guión:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "En_viando correo"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Mo_strar imágenes animadas"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Firmas:"
 
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Sand Point"
+
 #: mail/mail-config.glade.h:175
-msgid "_Use secure connection (SSL):"
-msgstr "U_sar conexiones seguras (SSL)"
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Contacto original:"
 
 #: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "Anchura _variable"
+msgid "_Use secure connection (SSL):"
+msgstr "U_sar conexiones seguras (SSL)"
 
 #: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "_cada"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "color"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "descripción"
 
@@ -13219,8 +13257,7 @@ msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Este mensaje está firmado digitalmente y es auténtico."
 
 #: mail/mail-format.c:1494
-msgid ""
-"This message is digitally signed but can not be proven to be authentic."
+msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Este mensaje está firmado digitalmente pero no se puede verificar su "
 "autenticidad."
@@ -13698,31 +13735,31 @@ msgstr "Más alta"
 msgid "Highest"
 msgstr "La más alta"
 
-#: mail/message-list.c:1076
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1112
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1114
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2610
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -13818,40 +13855,40 @@ msgstr "Re_trasada por:"
 msgid "_Flag:"
 msgstr "_Marca"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Analizando carpetas bajo %s en «%s»"
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Analizando carpetas de nivel superior en «%s»"
 
-#: mail/subscribe-dialog.c:331
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Suscribiendo a carpeta «%s»"
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "De-suscribiendo la carpeta «%s»"
 
-#: mail/subscribe-dialog.c:1246 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Carpeta"
 
-#: mail/subscribe-dialog.c:1356
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Buscando carpetas..."
 
-#: mail/subscribe-dialog.c:1470
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
-#: mail/subscribe-dialog.c:1545
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Por favor seleccione un servidor."
 
@@ -13885,18 +13922,25 @@ msgid "_Unsubscribe"
 msgstr "De-s_uscribir"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configuration control for the Evolution Summary."
-msgstr "Control de configuración para el resumen de Evolution."
-
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Configure la apariencia del Resumen de Evolution aquí"
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Componente del Resumen de Evolution"
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component."
+#, fuzzy
+msgid "Evolution Summary component"
 msgstr "Componente del Resumen de Evolution"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Componente del Resumen de Evolution"
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "Configuración del Resumen"
 
@@ -23786,15 +23830,15 @@ msgstr "LEMD:LEVS:LEVC"
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B %Y"
 
-#: my-evolution/e-summary.c:524
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "Por favor espere..."
 
-#: my-evolution/e-summary.c:590 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimir resumen"
 
-#: my-evolution/e-summary.c:624
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Ha fallado la impresión del resumen"
 
@@ -25065,23 +25109,23 @@ msgid "_Weather"
 msgstr "_Meteorología"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr ""
-"Control de configuración para la configuración de carpetas de Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 "Configure carpetas especiales y el comportamiento de las carpetas fuera de "
 "línea aquí"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "La shell de Evolution."
+
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
-msgstr "Configuración de Carpetas"
+msgid "Evolution folder settings configuration control"
+msgstr ""
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "La shell de Evolution."
+msgid "Folder Settings"
+msgstr "Configuración de Carpetas"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25113,8 +25157,8 @@ msgstr "Añadir una carpeta"
 msgid "Drafts"
 msgstr "Borradores"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:495
-#: shell/e-shell-view.c:499 shell/e-shortcuts.c:1084
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Entrada"
 
@@ -25150,40 +25194,7 @@ msgstr ""
 "Ha ocurrido un error mientras se copiaban archivos a\n"
 "«%s»."
 
-#: shell/e-setup.c:243
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution no puede crear el directorio\n"
-"%s:\n"
-"%s"
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-"El directorio %s\n"
-"no tiene los permisos adecuados. Por favor\n"
-"déle permisos de lectura y ejecución y reinicie Evolution."
-
-#: shell/e-setup.c:267
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-"El archivo %s\n"
-"debería ser eliminado para que Evolution funcione correctamente.\n"
-"Por favor elimine ese archivo y reinicie Evolution."
-
-#: shell/e-setup.c:290
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25194,7 +25205,7 @@ msgstr ""
 "Por favor, renombre lo para permitir la instalación\n"
 "de los archivos de usuario de Evolution."
 
-#: shell/e-setup.c:299
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25338,7 +25349,7 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Crear carpeta nueva"
 
-#: shell/e-shell-folder-title-bar.c:593 shell/e-shell-folder-title-bar.c:594
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
@@ -25354,11 +25365,10 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"Elija el archivo que quiere importar a Evolution, y seleccione de la lista el "
-"tipo de archivo que es.\n"
+"Elija el archivo que quiere importar a Evolution, y seleccione de la lista "
+"el tipo de archivo que es.\n"
 "\n"
-"Si no lo sabe, puede elegir «Automático» y Evolution tratará de "
-"encargarse."
+"Si no lo sabe, puede elegir «Automático» y Evolution tratará de encargarse."
 
 #: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
@@ -25377,30 +25387,30 @@ msgstr ""
 msgid "Select importer"
 msgstr "Seleccionar importador"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "El archivo %s no existe"
 
-#: shell/e-shell-importer.c:492 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:551
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:552
 msgid "Evolution Error"
 msgstr "Error de Evolution"
 
-#: shell/e-shell-importer.c:508
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
-"No hay ninguna herramienta para importar datos que pueda encargarse "
-"de\n%s"
+"No hay ninguna herramienta para importar datos que pueda encargarse de\n"
+"%s"
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25409,17 +25419,17 @@ msgstr ""
 "Importando %s.\n"
 "Comenzando %s"
 
-#: shell/e-shell-importer.c:536
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:550
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:567
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25428,31 +25438,31 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:621
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:670
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Nombre de archivo:"
 
-#: shell/e-shell-importer.c:675
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Tipo de archivo:"
 
-#: shell/e-shell-importer.c:709
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Importa datos y configuración de programas antiguos"
 
-#: shell/e-shell-importer.c:713
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Importar un único archivo"
 
-#: shell/e-shell-importer.c:779 shell/e-shell-startup-wizard.c:538
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25460,24 +25470,24 @@ msgstr ""
 "Por favor espere...\n"
 "Buscando configuraciones existentes"
 
-#: shell/e-shell-importer.c:782
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Comenzando importadores inteligentes"
 
-#: shell/e-shell-importer.c:906 shell/e-shell-startup-wizard.c:664
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 
-#: shell/e-shell-importer.c:1211 shell/importer/intelligent.c:191
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Importar"
 
@@ -25619,27 +25629,27 @@ msgstr "Trabajar desconectado"
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostrándose)"
 
-#: shell/e-shell-view.c:2054
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:2056
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(nada)"
 
-#: shell/e-shell-view.c:2100
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution está conectado.  Pulse este botón para trabajar "
 "desconectado."
 
-#: shell/e-shell-view.c:2107
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution está en proceso de desconectarse."
 
-#: shell/e-shell-view.c:2113
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25657,12 +25667,12 @@ msgstr ""
 "El error del sistema de activación es:\n"
 "%s"
 
-#: shell/e-shell.c:738
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No se pudo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1799
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25673,19 +25683,19 @@ msgstr ""
 "«%s» ha fallado inesperadamente. Deberá salir de Evolution y volver\n"
 "a entrar para poder acceder otra vez a esa información."
 
-#: shell/e-shell.c:2064
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:2066
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "No se pudo registrar en OAF"
 
-#: shell/e-shell.c:2068
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "No se encontró la base de datos de configuración"
 
-#: shell/e-shell.c:2070 shell/e-storage.c:572
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Error genérico"
 
@@ -25921,63 +25931,63 @@ msgstr ""
 "El error del sistema de activación es:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "Error CORBA"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Interrumpido"
 
-#: shell/evolution-shell-component.c:1171
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Argumento inválido"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Ya tiene un dueño"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Sin dueño"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "No encontrado"
 
-#: shell/evolution-shell-component.c:1179
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Tipo no soportado"
 
-#: shell/evolution-shell-component.c:1181
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Schema no soportado"
 
-#: shell/evolution-shell-component.c:1183
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Operación no soportada"
 
-#: shell/evolution-shell-component.c:1185
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Error interno"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Salir"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "URI no válida"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Tiene subcarpetas"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "No queda sitio"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "El antiguo dueño a muerto"
 
@@ -25997,10 +26007,6 @@ msgstr "Pulse Aceptar para cerrar estas conexiones y quedar desconectado"
 msgid "The following connections are currently active:"
 msgstr "Las siguientes conexiones están actualmente activas:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "dialog1"
-msgstr "diálogo1"
-
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
 msgstr "_Agenda"
@@ -26137,16 +26143,16 @@ msgstr "No me preguntes más veces"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution puede importar datos de los siguiente s archivos:"
 
-#: shell/main.c:110 shell/main.c:556
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:116
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Evolution está terminando ..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:264
+#: shell/main.c:266
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26184,47 +26190,51 @@ msgstr ""
 "esperamos que disfrute de nuestro duro trabajo, y esperamos su "
 "contribución.\n"
 
-#: shell/main.c:288
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "El equipo de Ximian Evolution\n"
 
-#: shell/main.c:296
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "No preguntarme más veces"
 
-#: shell/main.c:385
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No se pudo acceder a la shell de Ximian Evolution."
 
-#: shell/main.c:394
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "No se pudo inicializar la shell de Ximian Evolution: %s"
 
-#: shell/main.c:526
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Deshabilita la pantalla de entrada"
 
-#: shell/main.c:528
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
-#: shell/main.c:530
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: shell/main.c:532
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr ""
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr "Envía la salida de depurado de todos los componente a un archivo."
 
-#: shell/main.c:535
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 "Fuerza la actualización de los archivos de configuración de Evolution 1.0.x"
 
-#: shell/main.c:560
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26234,7 +26244,6 @@ msgstr ""
 "  use %s --help para más información\n"
 
 #: tools/evolution-addressbook-abuse.c:81
-#: tools/evolution-addressbook-export.c:41
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Error cargando la agenda predeterminada."
@@ -26244,10 +26253,6 @@ msgstr "Error cargando la agenda predeterminada."
 msgid "Input File"
 msgstr "Archivo de entrada"
 
-#: tools/evolution-addressbook-export.c:51
-msgid "Output File"
-msgstr "Archivo de salida"
-
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "No ha especificado un nombre de archivo."
@@ -26276,6 +26281,19 @@ msgstr "Marcar adjunto para que sea mostrado incluido por omisión."
 msgid "Default subject for the message."
 msgstr "Asunto preestablecido para el mensaje."
 
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "No se pudo renombrar: «%s»: %s"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Copia Contact(os) a Otra Carpeta..."
@@ -26620,8 +26638,7 @@ msgstr "Olvidar _contraseñas"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
-"Olvida las contraseñas almacenadas así que se le preguntarán de nuevo"
+msgstr "Olvida las contraseñas almacenadas así que se le preguntarán de nuevo"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
@@ -27924,40 +27941,202 @@ msgstr "_Encontrar ahora"
 msgid "_Clear"
 msgstr "_Limpiar"
 
-#: widgets/misc/e-search-bar.c:839
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: widgets/misc/e-search-bar.c:846
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr "ID de subelemento"
 
-#: widgets/misc/e-search-bar.c:853
+#: widgets/misc/e-search-bar.c:847
 msgid "Text"
 msgstr "Texto"
 
-#: widgets/misc/e-search-bar.c:931
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Limpiar"
 
-#: widgets/misc/e-search-bar.c:933
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Buscar ahora"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "El servidor de libretas de direcciones personales"
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Visor de minitarjetas de la agenda de Evolution"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
 #: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "El servidor de calendarios personales. Fábrica de calendarios"
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Visor de calendario iTip/iMip de Evolution"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Visor de minitarjetas de la agenda de Evolution"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Fábrica para importar archivos LDIF a Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importa archivos LDIF a Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Fábrica para importar archivos VCard a Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importa archivos VCard a Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Un control Bonobo para una ventana de dirección."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Un control Bonobo para mostrar una dirección."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Un control Bonobo de ejemplo que muestra una agenda."
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr ""
+#~ "Control de configuración para los Almacenes de la Libreta de Evolution"
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Control que muestra minitarjetas de direcciones en Evolution."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Componente de Evolution para manejar contactos."
+
+#~ msgid "Factory for the controls exported by the Evolution Addressbook"
+#~ msgstr ""
+#~ "Fábrica para los controles exportados por la Libreta de Direcciones de "
+#~ "Evolution."
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Fábrica para la interfaz de selección de nombre de la Agenda"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Lista de contactos anónima"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d no mostrado)"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Un control bonobo que muestra una lista de tareas."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Un control bonobo de ejemplo que muestra un agenda."
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Control de configuración del Calendario de Evolution."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Componente de Evolution para manejar el calendario"
+
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Fábrica para objetos de Evolution Calendar."
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr ""
+#~ "Fábrica para centralizar el componente del editor de diálogos del agenda"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Servicio de notificación de alarmas"
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Fábrica para importar archivos iCalendar en Evolution."
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importa archivos iCalendar en Evolution."
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importa archivos vCalendar en Evolution."
+
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Control de configuración de tipografías de Evolution."
+
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Control de configuración para las cuentas de correo de Evolution."
+
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Control de Configuración para el envío de correo de Evolution."
+
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Control de configuración para el compositor de correo de Evolution."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Componente Evolution para manejar el correo."
+
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr "Fábrica para los controles exportados por Evolution Mailer"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Fábrica para importar archivos mbox a Evolution."
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importa archivos mbox a Evolution."
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Fábrica para importar mensajes de Outlook Express 4 a Evolution."
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importa archivos de Outlook Express 4 a Evolution."
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Fuentes en pantalla"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "_Anchura fija:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "Anchura _variable"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Control de configuración para el resumen de Evolution."
+
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr ""
+#~ "Control de configuración para la configuración de carpetas de Evolution"
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution no puede crear el directorio\n"
+#~ "%s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Directory %s\n"
+#~ "does not have the right permissions. Please make it\n"
+#~ "readable and executable and restart Evolution."
+#~ msgstr ""
+#~ "El directorio %s\n"
+#~ "no tiene los permisos adecuados. Por favor\n"
+#~ "déle permisos de lectura y ejecución y reinicie Evolution."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "El archivo %s\n"
+#~ "debería ser eliminado para que Evolution funcione correctamente.\n"
+#~ "Por favor elimine ese archivo y reinicie Evolution."
+
+#~ msgid "Output File"
+#~ msgstr "Archivo de salida"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "El servidor de libretas de direcciones personales"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "El servidor de calendarios personales. Fábrica de calendarios"
 
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:3
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:3
-msgid "Wombat InterfaceCheck interface"
-msgstr "Interfaz wombat InterfaceCheck"
+#~ msgid "Wombat InterfaceCheck interface"
+#~ msgstr "Interfaz wombat InterfaceCheck"
 
 #~ msgid "1234"
 #~ msgstr "1234"
diff --git a/po/et.po b/po/et.po
index 58bc2d3f14..5b09c5ada3 100644
--- a/po/et.po
+++ b/po/et.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 1.0.2\n"
-"POT-Creation-Date: 2002-10-28 16:49-0500\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2002-03-08 19:58+0200\n"
 "Last-Translator: T�ivo Leedj�rv <toivo@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -20,40 +20,52 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution'i impordiassistent"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-msgid "Imports LDIF files into Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution'i s�numiredaktor."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Impordib VKaardi-vormingus failid Evolution'i."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution'i s�numiredaktor."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Fail kui"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nimi"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-post"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Esmane"
 
@@ -63,16 +75,17 @@ msgstr "Esm"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "�ri"
 
@@ -82,12 +95,12 @@ msgid "Bus"
 msgstr "T��"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Tagasihelistamine"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Firma"
 
@@ -98,12 +111,13 @@ msgstr "Firma"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Kodu"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisatsioon"
@@ -114,18 +128,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Mobiil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax t��l"
@@ -135,13 +149,13 @@ msgid "Bus Fax"
 msgstr "Fax t��l"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Kodune faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "�ri 2"
 
@@ -150,43 +164,43 @@ msgid "Bus 2"
 msgstr "�ri 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Kodu 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Muu"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Muu faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Piipar"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Raadio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
@@ -197,15 +211,15 @@ msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-post 3"
@@ -229,6 +243,7 @@ msgid "Dep"
 msgstr "Osak"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Kontor"
@@ -238,6 +253,7 @@ msgid "Off"
 msgstr "Kont"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Tiitel"
@@ -252,6 +268,7 @@ msgid "Prof"
 msgstr "Ala"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Juht"
@@ -265,6 +282,7 @@ msgid "Ass"
 msgstr "Abil"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "H��dnimi"
@@ -274,16 +292,19 @@ msgid "Nick"
 msgstr "H��dnimi"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1418
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Abikaasa"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1459
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "M�rkus"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "Kalendri URI"
 
@@ -301,247 +322,350 @@ msgid "FBUrl"
 msgstr "VHUrl"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Default server calendar"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "Kalender"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "Aastap�ev"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Aastap"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "S�nniaeg"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategooriad"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Perekonnanimi"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "Auto"
+
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-card-simple.c:893
 #: addressbook/backend/ebook/e-destination.c:706
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Nimetu kontaktide nimekiri"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "Mitu VKaarti"
+#: addressbook/backend/ebook/e-card.c:1308
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "T�isnimi"
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "VKaart %s jaoks"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Aadress:"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "Aadressikaardid"
+
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "S�nniaeg"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-#: addressbook/backend/ebook/load-pine-addressbook.c:22
-#: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
-#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/e-card.c:1355
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1369
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Organisatsioon"
+
+#: addressbook/backend/ebook/e-card.c:1390
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Roll"
+
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+#, fuzzy
+msgid "Mailer"
+msgstr ""
+"\n"
+"Postiprogramm:"
+
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "_H�ivatuse URL:"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Kalender"
+
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Kustutada kontakt?"
+
+#: addressbook/backend/ebook/e-card.c:1480
+#, fuzzy
+msgid "Category List"
+msgstr "Kategooria on"
+
+#: addressbook/backend/ebook/e-card.c:1487
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1494
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1501
+#, fuzzy
+msgid "List"
+msgstr "Lista"
+
+#: addressbook/backend/ebook/e-card.c:1508
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Muu aadress"
+
+#: addressbook/backend/ebook/e-card.c:1515
+#, fuzzy
+msgid "Arbitrary"
+msgstr "Amritsar"
+
+#: addressbook/backend/ebook/e-card.c:1522
+#, fuzzy
+msgid "ID"
+msgstr "I"
+
+#: addressbook/backend/ebook/e-card.c:1529
+#, fuzzy
+msgid "Last Use"
+msgstr "Aseta"
+
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "Skoor"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "Ei saa laadida Bonobot"
 
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:2978
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Otsin..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Laen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "Loendi _nimi:"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "See on e-_postiaadress"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "�hendan LDAP serveriga..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Lisan kaardi LDAP serverisse..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Eemaldan kaardi LDAP serverist..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1572
-#: addressbook/backend/pas/pas-backend-ldap.c:1575
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "Muudan kaarti LDAP serveris..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "V�tan vastu LDAP otsingu tulemused..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 #, fuzzy
 msgid "Error performing search"
 msgstr "Viga kaardi eemaldamisel"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 #, fuzzy
 msgid "Default Sync Address:"
 msgstr "E-posti aadress:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Kursorit ei saa laadida\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook ei ole laetud\n"
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Ei saa k�ivitada wombat serverit"
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "EI saa k�ivitada wombatit"
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "A Bonobo control for an address popup."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Bonobo v�li aadressi jaoks."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "A sample Bonobo control which displays an addressbook."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Configure access to LDAP directory servers here"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control that displays an Evolution addressbook minicard."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution Addressbook minicard viewer"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Muuda aadressiraamatut"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Evolution component for handling contacts."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Factory for the Addressbook Minicard control"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Factory for the Addressbook's address popup"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Factory for the Addressbook's address displayer"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Addressbook minicard viewer"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
-msgstr "Factory for the Addressbook's address popup"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Addressbook minicard viewer"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution Addressbook minicard viewer"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr "Factory for the sample Addressbook control"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution Addressbook minicard viewer"
 
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:611
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1067
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
 msgstr "Kontaktid"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "Kontaktide infot sisaldav kaust"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "LDAP server"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "Kontaktide infot sisaldav LDAP server"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public Contacts"
 msgstr "Kontaktid"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public folder containing contact information"
 msgstr "Kontaktide infot sisaldav kaust"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Uus kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Loob uue kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Uus kontaktide nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "Kontaktide _nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Loob uue kontaktide nimekirja"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Ei saa luua �hendust LDAP serveriga."
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -549,57 +673,48 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:648
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1193
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Viga filtriinfo laadimisel:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 
-#: addressbook/gui/component/addressbook-config.c:1630
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Konto nimi"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Serveri nimi"
 
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
-msgid "Could not initialize gnome-vfs"
-msgstr "Ei saa gnome-vfs initsialiseerida"
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Teised kontaktid"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "Aadressiraamatu avamine eba�nnestus"
-
-#: addressbook/gui/component/addressbook.c:480
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -607,7 +722,7 @@ msgstr ""
 "Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee\n"
 "on �ige ja kas sul on sellele vajalikud ligip��su�igused."
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:522
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -618,7 +733,7 @@ msgstr ""
 "olla see, et sisestasid vale URI v�i kasutatav LDAP server\n"
 "on maas"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -630,7 +745,7 @@ msgstr ""
 "ise Evolution'i l�htetekstidest kokku kompileerima.\n"
 "Eelnevalt laadi OpenLDAP allj�rgneva viida abil.\n"
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:537
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -641,12 +756,15 @@ msgstr ""
 "olla see, et sisestasid vale URI v�i kasutatav LDAP server\n"
 "on maas"
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:582
+#: addressbook/gui/component/addressbook.c:557
+msgid "Unable to open addressbook"
+msgstr "Aadressiraamatu avamine eba�nnestus"
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -654,38 +772,38 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:633
-#: addressbook/gui/component/addressbook.c:636
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Palun sisesta %s parool (kasutaja %s)"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 #, fuzzy
 msgid "Name begins with"
 msgstr "l�ppeb"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 #, fuzzy
 msgid "Email begins with"
 msgstr "l�ppeb"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategooria on"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Suvaline v�li sisaldab"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Edasij�udnutele..."
 
-#: addressbook/gui/component/addressbook.c:956
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -693,7 +811,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:962
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -701,25 +819,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:968
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:975
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1050
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr "Suvaline kategooria"
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, mida kaustalehitseja n�itab"
 
@@ -728,139 +846,126 @@ msgstr "URI, mida kaustalehitseja n�itab"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr "(puudub)"
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/component/e-address-popup.c:478
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "Peamine e-post"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Vali tegevus"
 
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Loo uus kontakt \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Aadressiraamatust p�rimine..."
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Muuda kontakti andmeid"
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Lisa kontaktide hulka"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "�henda e-posti aadressid"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Keela p�ringud"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Luba p�ringud (Ohtlik!)"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "_Tuvasta toetatavad t��bid"
 
-#: addressbook/gui/component/ldap-config.glade.h:2
-msgid "1234"
+#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:5
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-#, fuzzy
-msgid "380"
-msgstr "389"
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "636"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "666"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "<- _Remove"
-msgstr " _Eemalda"
+msgid "Add LDAP Server"
+msgstr "LDAP server"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "H��lestus"
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "Aadressiraamatu allikas"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always"
 msgstr "Alarmid"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Anonymously"
 msgstr "Anon��mne"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -869,79 +974,61 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Connecting"
 msgstr "Connecticut"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
-msgid "DN Customization"
-msgstr "Info puudub"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "_Kustuta"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "Loendi _nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "LDAP server"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "E-posti aadress:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
-msgid "Evolution Attribute"
-msgstr "Evolution'i alarm "
-
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution kasutab seda e-posti aadressi sinu autentimiseks serverile"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution kasutab seda e-posti aadressi sinu autentimiseks serverile"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Finished"
 msgstr "_Otsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "�ldine"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "LDAP Configuration Assistant"
 msgstr "H��lestus"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Mappings"
-msgstr "Veerised"
-
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_intervalliga:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -951,72 +1038,35 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:42
-msgid "Objectclasses Used in Evolution:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses Used on Server:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "�ks"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "R_estore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Re_store Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Otsi _kehtivuspiirkonnast:"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
-#: calendar/gui/e-week-view.c:1240
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 msgid "Searching"
 msgstr "Otsin"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
-msgid "Select"
-msgstr "Vali k�ik"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Kustutatud"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -1027,7 +1077,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1036,54 +1086,47 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Allika info"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "�hendun serverisse..."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Toetamata skeem"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1091,7 +1134,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1100,7 +1143,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1108,17 +1151,17 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
 "directory tree. A search scope of \"sub\" will include all entries below "
 "your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1128,27 +1171,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1158,7 +1201,7 @@ msgstr ""
 "Seda nime kasutatakse sinu konto tuvastamiseks (programmisiseselt ja ainult "
 "n�itamiseks."
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1166,88 +1209,46 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "Using email address"
 msgstr "See on e-_postiaadress"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:108
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Lisa"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-#, fuzzy
-msgid "_Add ->"
-msgstr "_Lisa"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-#, fuzzy
-msgid "_Add Mapping"
-msgstr "Lisa tegevus"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-#, fuzzy
-msgid "_Add to DN"
-msgstr "Lisa tegevus"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-#, fuzzy
-msgid "_Always"
-msgstr "Alarmid"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "_Kustuta k�ik"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Display name:"
 msgstr "N_�ita"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Distinguished Name (DN):"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_Don't use SSL/TLS"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1257,207 +1258,150 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Redaktor"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "_Muuda kohtumist"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-#, fuzzy
-msgid "_Evolution attribute:"
-msgstr "Evolution'i alarm "
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_If necessary "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "_LDAP attributes:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-#, fuzzy
-msgid "_More Options >>"
-msgstr "_H��lestus"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
-msgid "_Restore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Search base:"
 msgstr "Otsi _baasist:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "_Serveri nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Easil�kkamise aeg (minutites)"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
-#, fuzzy
-msgid "account-druid"
-msgstr "Konto %d"
-
-#: addressbook/gui/component/ldap-config.glade.h:132
-#, fuzzy
-msgid "account-editor"
-msgstr "kontaktide-nimekirja-redaktor"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "cards"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Taastan �henduse: %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:136
-msgid "edit_server_window_simple"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:97
 #, fuzzy
 msgid "general-tab"
 msgstr "�ldine"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:139
-msgid "objectclasses-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "searching-tab"
 msgstr "Otsin"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
 msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Eemalda k�ik"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:699
-#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
-#: shell/e-shortcuts-view.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Eemalda"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr "Eemalda k�ik"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Uus kontaktide nimekiri"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "Muuda kontakti andmeid"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
 msgid "Send HTML Mail?"
 msgstr "Saata HTML s�num?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
-msgstr "Muuda kontaktide nimekirja"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
-msgid "Unnamed Contact List"
-msgstr "Nimetu kontaktide nimekiri"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d n�itamata)"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr "Nimetu kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+msgid "Source"
+msgstr "Allikas"
+
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Kontaktide valimine aadressiraamatust"
 
-#: addressbook/gui/component/select-names/e-select-names.c:564
+#: addressbook/gui/component/select-names/e-select-names.c:648
 #, fuzzy
 msgid "Find contact in"
 msgstr "Saatja sisaldab"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Find"
+msgstr "Leia:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Vali nimed"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 #, fuzzy
 msgid "Selected Contacts:"
 msgstr "Kustutada kontakt?"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 #, fuzzy
 msgid "Show Contacts"
 msgstr "Kontaktid"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid ""
 "Type a name into the entry, or\n"
 "select one from the list below:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
 msgstr "Kate_gooria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "_Kaust:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr "Assistendi n_imi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr "_Aadress..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "_Aastap�ev:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr "_S�nnip�ev:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "_Kontaktid..."
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Kate_gooriad"
@@ -1468,7 +1412,7 @@ msgstr "Koost��"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
@@ -1477,7 +1421,7 @@ msgid "D_epartment:"
 msgstr "_Oskaond:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "T�psustused"
 
@@ -1519,1144 +1463,1193 @@ msgstr "T_��koht:"
 msgid "P_rofession:"
 msgstr "Am_et:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Telefoni t��bid"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "S_pouse:"
 msgstr "Abi_kaasa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "This is the _mailing address"
 msgstr "See on e-_postiaadress"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Wants to receive _HTML mail"
 msgstr "Soovib saada _HTML s�numeid"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
-#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
-#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "_Kustuta"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "Ameti_nimetus:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "_Juhataja nimi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "_H��dnimi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "Ko_ntor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "_Avaliku kalendri URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "Kodulehe aad_ress"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:183
+#, fuzzy
+msgid "Editable"
+msgstr "Luba"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "�hendriigid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albaania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Al�eeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr "Ameerika Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr "Antigua ja Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentiina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr "Armeenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Austraalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Austria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "Aserbaid�aan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr "Valgevene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Boliivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia ja Hertsegoviina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr "Bouvet' saar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brasiilia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
 msgstr "Briti India ookeani ala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr "Brunei"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgaaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr "Kambod�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr "Roheneemesaared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Kaimanisaared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
 msgstr "Kesk-Aafrika Vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "T�aad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "T�iili"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "Hiina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "J�ulusaar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr "Kookossaared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr "Komoorid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Kongo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr "Cooki saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr "Elevandiluurannik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Horvaatia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Kuuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "K�pros"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "T�ehhi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Taani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Dominikaani vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "Ida-Timor"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egiptus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Ekvatoriaal-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Eesti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etioopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Falklandi saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "F��ri saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fid�i"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Soome"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Prantsusmaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Prantsuse Guajaana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Prantsuse Pol�neesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Prantsuse L�unaalad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Gruusia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Saksamaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Kreeka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Gr��nimaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr "Guinea-Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr "Heard ja McDonald"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "Hong-Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Ungari"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "Indoneesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Iirimaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Iisrael"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Itaalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Jaapan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordaania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kasahstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Keenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #, fuzzy
 msgid "Korea, Republic Of"
 msgstr "Korea Vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuveit"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr "K�rg�zstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr "L�ti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Liibanon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Libeeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Leedu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Macau"
 msgstr "Macau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr "Makedoonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr "Malaisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr "Malediivid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr "Marshalli saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr "Mauritaania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr "Mehhiko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr "Mikroneesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 #, fuzzy
 msgid "Moldova, Republic Of"
 msgstr "Korea Vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr "Mongoolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr "Maroko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr "Mosambiik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr "Namiibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr "Holland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "Hollandi Antillid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "Uus-Kaledoonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr "Uus-Meremaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr "Nigeeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr "Norfolk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr "P�hja-Mariaanid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr "Norra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr "Omaan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr "Palestiina territoorium"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr "Paapua Uus-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
 msgid "Peru"
 msgstr "Peruu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr "Filipiinid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr "Poola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr "Katar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr "Rumeenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr "Venemaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts ja Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Saint Vincent ja Grenadiinid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
 msgstr "S�o Tom� ja Pr�ncipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr "Saudi Araabia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr "Sei�ellid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr "Singapur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr "Slovakkia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr "Sloveenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr "Saalomoni Saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr "Somaalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr "L�una-Aafrika Vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr "Hispaania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr "Saint Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre And Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr "Sudaan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
 msgid "Suriname"
 msgstr "Suriname"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Teravm�ed"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr "Svaasimaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr "Rootsi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr "�veits"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr "Taivan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr "Tad�ikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 #, fuzzy
 msgid "Tanzania, United Republic Of"
 msgstr "Tansaania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "Tai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr "Trinidad ja Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "Tuneesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr "T�rgi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr "T�rkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr "Turks ja Caicos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
 msgstr "Araabia �hendemiraadid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr "�hendkuningriik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr "�hendriikida hajasaared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr "Venetsueela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #, fuzzy
 msgid "Virgin Islands, British"
 msgstr "Neitsisaared, USA"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 #, fuzzy
 msgid "Virgin Islands, U.S."
 msgstr "Neitsisaared, USA"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis ja Futuna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr "L��ne-Sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr "Jeemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr "Jugoslaavia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr "Sambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Kas sa t�esti tahad\n"
-"kustutada seda kontakti?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:459
+#, fuzzy
+msgid "Book"
+msgstr "Bodo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "Kustutada kontakt?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
+#, fuzzy
+msgid "Card"
+msgstr "Auto"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+#, fuzzy
+msgid "Is New Card"
+msgstr "Uus"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#, fuzzy
+msgid "Writable Fields"
+msgstr "Merril Field"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "T�aad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Kategooriaredaktor pole saadaval."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:833
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "Antud kontakt kuulub j�rgnevatesse kategooriatesse:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Kontakti salvestamine VKaardina"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Kas sa t�esti tahad\n"
+"kustutada seda kontakti?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Kas sa t�esti tahad\n"
+"kustutada seda kontakti?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2440
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Ei leidnud vidinat v�ljale: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Kontakti kiirlisamine"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Redigeeri k�ike"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "T�isnimi"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "E-post"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "Viga faili salvestamisel: %s"
+
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr "kaart.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "nimekiri"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:221
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2665,150 +2658,147 @@ msgstr ""
 "%s on juba olemas\n"
 "Kas soovid �le kirjutada?"
 
-#: addressbook/gui/contact-editor/file-exists.glade.h:1
-msgid "Confirm Overwrite"
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:2
-msgid "Don't bother translating this string.  It's not used."
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 #, fuzzy
 msgid "Overwrite"
 msgstr "Kirjutada fail �le?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Aadress _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Kontrolli aadressi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Riik:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Aadress:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "_Linn:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Sidejaoskonna postkast:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Maakond/Provints:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_Postiindeks:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "Kontrolli t�isnime"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Preili"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "H�rra"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Proua"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Pr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Eesnimi:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Perekonnanimi:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Liignimi:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_J�relliide:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Tiitel:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "List _name:"
 msgstr "Loendi _nimi:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Members"
 msgstr "Liikmed"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Type an email address or drag a contact into the list below:"
 msgstr "Kirjuta e-posti aadress v�i tiri kontakt allolevasse loendisse:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Peida aadressid sellesse listi kirja saatmisel"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Eemalda"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "contact-list-editor"
 msgstr "kontaktide-nimekirja-redaktor"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "Uus nimekiri"
+
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 msgid "Contact List Editor"
 msgstr "Kontaktiloendi redaktor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Salvesta nimekiri VKaardina"
 
@@ -2862,276 +2852,297 @@ msgstr ""
 "Muudetud kontsakti e-posti aadress v�i nimi juba\n"
 "eksisteerib antud kaustas. Kas sa soovid seda ikka lisada?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:153
+#. FIXME: get the toplevel window...
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Eriotsing"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Otsi"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 kaart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d kaarti"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:408
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:466
+#, fuzzy
+msgid "Query"
+msgstr "Quimper"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Viga %s k�ivitamisel"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#, fuzzy
+msgid "Model"
+msgstr "Molde"
+
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
-#: addressbook/gui/widgets/e-addressbook-util.c:91
-#: addressbook/gui/widgets/e-minicard.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Viga kaardi muutmisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1141
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "�nnestus"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Hoidla offlain"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1171
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "Juurdep��s keelatud"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Kaarti ei leitud"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Kaardi ID on juba olemas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Mitte toetatud protokoll"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
-#: camel/camel-service.c:739 camel/camel-service.c:779
-#: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:779
+#: camel/camel-service.c:849 camel/camel-service.c:892
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr "Katkestatud"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Autentimine eba�nnestus."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autentimine on vajalik"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "Faili %s ei leitud."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Muu viga"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:63
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Kas soovid muudatused salvestada?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#, fuzzy
+msgid "_Discard"
+msgstr "Dinard"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Viga listi lisamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
-#: addressbook/gui/widgets/e-addressbook-util.c:292
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Viga kaardi lisamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Viga listi muutmisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Viga listi eemaldamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
-#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1588
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Viga kaardi eemaldamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-#, fuzzy
-msgid "Display Cards?"
-msgstr "Kuva"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-#, fuzzy
-msgid "Display Cards"
-msgstr "Kuva"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:213
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 #, fuzzy
 msgid "Copy card to"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 #, fuzzy
 msgid "Move cards to"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Mitu VKaarti"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "VKaart %s jaoks"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "T��p"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Aadressiraamat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
-#: addressbook/gui/widgets/e-addressbook-view.c:813
-#: addressbook/gui/widgets/e-addressbook-view.c:1790
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salvesta VKaardina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "New Contact..."
 msgstr "Uus kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Uus kontaktide nimekiri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Mine kausta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 #, fuzzy
 msgid "Import..."
 msgstr "_Impordi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Otsi kontakte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Aadressiraamatu allikad..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot'i s�tted"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:814
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Saada kontakt edasi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Saada kontaktile s�num"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:816
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tr�ki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Tr�ki �mbrik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Ko_peeri kausta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_T�sta kausta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:826
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "L�ika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:827
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:828
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Aseta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Kustuta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 #, fuzzy
 msgid "Current View"
 msgstr "K�e_solev vaade"
@@ -3140,7 +3151,7 @@ msgstr "K�e_solev vaade"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,�,z,t,u,v,w,�,�,�,�,x,y"
 
@@ -3148,11 +3159,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,�,z,t,u,v,w,�,�,�,�,x,y"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,�,z,t,u,v,w,�,�,�,�,x,y"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1290
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3220,20 +3231,61 @@ msgstr "Muu telefon"
 msgid "Primary Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr "ja %d teist kaarti."
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "ja �ks teine kaart."
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "Salvesta aadressiraamatusse"
 
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+#, fuzzy
+msgid "Width"
+msgstr "Laius:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "K�rgus:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+#, fuzzy
+msgid "Field"
+msgstr "Fairfield"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "Perekonnanimi"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+#, fuzzy
+msgid "Text Model"
+msgstr "Teksti _suurus"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#, fuzzy
+msgid "Column Width"
+msgstr "Columbia"
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 #, fuzzy
 msgid ""
 "\n"
@@ -3248,7 +3300,7 @@ msgstr ""
 "\n"
 "Uue kontakti lisamiseks tee siin topeltkl�ps."
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 #, fuzzy
 msgid ""
 "\n"
@@ -3261,21 +3313,41 @@ msgstr ""
 "\n"
 "Uue kontakti lisamiseks tee siin topeltkl�ps."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:452
+#, fuzzy
+msgid "Adapter"
+msgstr "Adrar"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Kustutatud"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "�lesannete sorteerimine"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Kaardi vaade"
 
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#, fuzzy
+msgid "GTK Tree View"
+msgstr "N�dala vaade"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Tr�ki �mbrik"
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Tr�ki kaardid"
 
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
 msgid "Print card"
 msgstr "Tr�ki kaart"
 
@@ -3348,7 +3420,6 @@ msgid "Include:"
 msgstr "Lisa:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "R�htpaigutus"
 
@@ -3368,17 +3439,16 @@ msgstr "Veerised"
 msgid "Number of columns:"
 msgstr "Tulpade arv:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "H��lestus"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Suund"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Lehek�lg"
 
@@ -3394,9 +3464,7 @@ msgstr "Paber"
 msgid "Paper source:"
 msgstr "Paberiallikas:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "P�stpaigutus"
 
@@ -3456,43 +3524,167 @@ msgstr "_Kirjat��p..."
 msgid "Untitled appointment"
 msgstr "Nimetu s�ndmus"
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr "1."
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "2."
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "3."
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr "4."
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr "5."
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr "6."
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr "7."
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr "8."
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr "9."
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr "10."
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr "11."
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr "12."
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr "13."
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr "14."
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr "15."
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr "16."
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr "17."
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr "18."
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr "19."
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr "20."
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr "21."
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "22."
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "23."
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr "24."
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr "25."
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr "26."
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr "27."
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr "28."
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr "29."
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr "30."
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr "31."
+
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "K�rge"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1721
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "Keskmine"
 
-#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "Madal"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr "M��ramata"
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Viga kalendriserveriga suhtlemisel"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3501,88 +3693,79 @@ msgstr ""
 msgid "Default Priority:"
 msgstr "T�_htsus:"
 
-#: calendar/conduits/todo/todo-conduit.c:951
 #: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Bonobo v�li �lesannete loendi kuvamiseks."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Bonobo n�idisv�li kalendri kuvamiseks."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #, fuzzy
 msgid "Calendar and Tasks"
 msgstr "Kalendri ja �lesannete s�tted"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Evolution'i kalendrihaldamise komponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr ""
 
-# !PARANDA!
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendri ja �lesannete s�tted"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution'i kalendrihaldamise komponent."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution'i s�numikausta kuvamise komponent."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Evolution Tasks control"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr ""
+# !PARANDA!
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution'i kalendri iTip/iMip vaataja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
-msgstr ""
+# !PARANDA!
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution'i kalendri iTip/iMip vaataja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution'i uudiseredaktor"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "Factory to create a component editor factory"
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution'i uudiseredaktor"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
 msgstr "Alarmi teenus"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Starting:"
 msgstr "Algus:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Ending:"
 msgstr "L�pp:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr "vigane aeg"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm %s"
@@ -3604,11 +3787,17 @@ msgstr "Easil�kkamise aeg (minutites)"
 msgid "_Edit appointment"
 msgstr "_Muuda kohtumist"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:741
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
+msgid "Warning"
+msgstr "Hoiatus"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:849
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3620,13 +3809,7 @@ msgstr ""
 "meili teel.  Evolution kuvab selle asemel hariliku\n"
 "meeldetuletusdialoogi."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Hoiatus"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:764
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3643,16 +3826,16 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi k�ivitada?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:778
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Seda k�simust rohkem mitte esitada."
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "GNOME l�htestamine nurjus"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "Ei saa gnome-vfs initsialiseerida"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3668,36 +3851,36 @@ msgstr "Kirjeldus sisaldab"
 msgid "Comment contains"
 msgstr "Kommentaar sisaldab"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr "Puudub"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr "%A, %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:409 calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:416
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:440 calendar/gui/calendar-commands.c:442
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d. %B"
 
@@ -3706,67 +3889,168 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Kalendrivaate loomine nurjus. Kontrolli ORBit'i ja OAF'i seadistusi."
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
+msgid "Calendar"
+msgstr "Kalender"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "Kohtumisi ja s�ndmusi sisaldav kaust"
+
+#: calendar/gui/calendar-component.c:75
+#, fuzzy
+msgid "Public Calendar"
+msgstr "_Avaliku kalendri URL:"
+
+#: calendar/gui/calendar-component.c:76
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Kohtumisi ja s�ndmusi sisaldav kaust"
+
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
+msgid "Tasks"
+msgstr "�lesanded"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "�lesandeid sisaldav kaust"
+
+#: calendar/gui/calendar-component.c:85
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Tr�ki kaardid"
+
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "�lesandeid sisaldav kaust"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "New appointment"
+msgstr "Uus s�ndmus"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "_Appointment"
+msgstr "S�ndmus"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Lisab uue s�ndmuse"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "New meeting"
+msgstr "Uudistekanalite seadistused"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "_Meeting"
+msgstr "Kohtumine"
+
+#: calendar/gui/calendar-component.c:736
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Lisab uue �lesande"
+
+#: calendar/gui/calendar-component.c:740
+#, fuzzy
+msgid "New task"
+msgstr "Uus �lesanne"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_�lesanne"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Lisab uue �lesande"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Uus s�ndmus"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Uus _s�ndmus"
+
+#: calendar/gui/calendar-component.c:746
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Lisab uue s�ndmuse"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Isiklik"
 
-#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
+#: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Salajane"
 
-#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
 msgid "Public"
 msgstr "Avalik"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "P�"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "L�"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "Ida"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "L�"
 
-#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
+#: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "Vaba"
 
-#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1165
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr "Kinni"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "Pole alanud"
 
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "T��s"
 
-#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "L�petatud"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3777,345 +4061,155 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
-#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
-#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:79
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "Puudub"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Korduv"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "M��ratud"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
-#: calendar/gui/e-meeting-model.c:862
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
+#: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr "Jah"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:863
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Ei"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "P�eva vaade"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "T��n�dala vaade"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "N�dala vaade"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "Kuu vaade"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
-msgid "Calendar"
-msgstr "Kalender"
-
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr "Kohtumisi ja s�ndmusi sisaldav kaust"
-
-#: calendar/gui/component-factory.c:76
-#, fuzzy
-msgid "Public Calendar"
-msgstr "_Avaliku kalendri URL:"
-
-#: calendar/gui/component-factory.c:77
-#, fuzzy
-msgid "Public folder containing appointments and events"
-msgstr "Kohtumisi ja s�ndmusi sisaldav kaust"
-
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
-#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1063
-msgid "Tasks"
-msgstr "�lesanded"
-
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
-msgstr "�lesandeid sisaldav kaust"
-
-#: calendar/gui/component-factory.c:86
-#, fuzzy
-msgid "Public Tasks"
-msgstr "Tr�ki kaardid"
-
-#: calendar/gui/component-factory.c:87
-#, fuzzy
-msgid "Public folder containing to-do items"
-msgstr "�lesandeid sisaldav kaust"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "New appointment"
-msgstr "Uus s�ndmus"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "_Appointment"
-msgstr "S�ndmus"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "Lisab uue s�ndmuse"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "New meeting"
-msgstr "Uudistekanalite seadistused"
-
-#: calendar/gui/component-factory.c:755
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
-msgid "_Meeting"
-msgstr "Kohtumine"
-
-#: calendar/gui/component-factory.c:756
-#, fuzzy
-msgid "Create a new meeting request"
-msgstr "Lisab uue �lesande"
-
-#: calendar/gui/component-factory.c:760
-#, fuzzy
-msgid "New task"
-msgstr "Uus �lesanne"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "_�lesanne"
-
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "Lisab uue �lesande"
-
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "New All Day Appointment"
-msgstr "Uus s�ndmus"
+msgid "Error while opening the calendar"
+msgstr "Viga kalendriserveriga suhtlemisel"
 
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "All _Day Appointment"
-msgstr "Uus _s�ndmus"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
 
-#: calendar/gui/component-factory.c:766
+#: calendar/gui/comp-editor-factory.c:473
 #, fuzzy
-msgid "Create a new all-day appointment"
-msgstr "Lisab uue s�ndmuse"
+msgid "Permission denied to open the calendar"
+msgstr "Juurdep��s keelatud"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URI, mida kalender n�itab"
 
-#: calendar/gui/control-factory.c:174
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Helialarmi h��lestus"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "S�numialarmi h��lestus"
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Kirjaalarmi h��lestus"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Programmi alarmi h��lestus"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Tundmatu alarmi h��lestus"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Korduv alarm"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-#, fuzzy
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
-msgstr ""
-"See on meili-meeldetuletus, aga Evolution ei toeta veel seda t��pi "
-"meeldetuletusi. Seet�ttu ei saa selle meeldetuletuse seadistusi muuta."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "N�idatav s�num"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "S�numi sisu"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "M�ngi heli:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Korda alarmi t�iendavalt"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "K�ivita programm:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Saada"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Nende parameetritega:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
-#: filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
 msgid "days"
 msgstr "p�eva"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "korda, vahemikuga"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
-#: filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "tundi"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
-#: filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutit"
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
-msgstr "%d p�eva"
-
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
-msgstr "1 p�ev"
-
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
-msgstr "%d n�dalat"
-
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "1 n�dal"
-
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
-msgstr "%d tundi"
-
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
-msgstr "1 tund"
-
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
-msgstr "%d minutit"
-
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
-msgstr "1 minut"
-
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekundit"
-
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
-msgstr "1 sekund"
-
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "M�ngi heli"
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "N�ita teadet"
-
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "Saada s�num"
-
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "K�ivita programm"
-
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
-msgstr "Teostatakse tundmatu tegevus"
-
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s enne s�ndmuse algust"
-
-#: calendar/gui/dialogs/alarm-page.c:416
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s p�rast s�ndmuse algust"
-
-#: calendar/gui/dialogs/alarm-page.c:421
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s s�ndmuse alguses"
-
-#: calendar/gui/dialogs/alarm-page.c:430
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s enne s�ndmuse l�ppu"
-
-#: calendar/gui/dialogs/alarm-page.c:433
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s p�rast s�ndmuse l�ppu"
-
-#: calendar/gui/dialogs/alarm-page.c:438
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s s�ndmuse l�pus"
-
-#: calendar/gui/dialogs/alarm-page.c:462
-#, c-format
-msgid "%s at %s"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:468
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s tundmatule trigeri t��bile"
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4126,46 +4220,63 @@ msgstr "P�hilised asjad"
 msgid "Date/Time:"
 msgstr "Kuup�ev ja kell:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "N�ita teadet"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "M�ngi heli"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Meeldetuletajad"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "K�ivita programm"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Saada s�num"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuv�te:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_H��lestus..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "p�rast"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "enne"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "p�ev(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "s�ndmuse l�ppu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "tund(i)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "minuti(t)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "s�ndmuse algust"
 
@@ -4189,7 +4300,7 @@ msgstr "30 minutit"
 msgid "60 minutes"
 msgstr "60 minutit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4215,7 +4326,8 @@ msgid "Days"
 msgstr "P�ev(a)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Reede"
 
@@ -4228,7 +4340,8 @@ msgid "Minutes"
 msgstr "Minut(it)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Esmasp�ev"
 
@@ -4238,7 +4351,8 @@ msgid "S_un"
 msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Laup�ev"
 
@@ -4251,7 +4365,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "_Kuup�eva valikul kuvatakse n�dalate numbreid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1137
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "P�hap�ev"
 
@@ -4270,7 +4385,8 @@ msgid "Task List"
 msgstr "�lesannete n_imekiri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Neljap�ev"
 
@@ -4287,7 +4403,8 @@ msgid "Time format:"
 msgstr "Aja vorming:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Teisip�ev"
 
@@ -4296,7 +4413,8 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Kolmap�ev"
 
@@ -4339,7 +4457,7 @@ msgid "_Fri"
 msgstr "_R"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_�ldine"
 
@@ -4384,158 +4502,162 @@ msgstr "_K"
 msgid "before every appointment"
 msgstr "enne s�ndmuse algust"
 
-#: calendar/gui/dialogs/cancel-comp.c:56
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:59
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Kas sa t�esti soovid katkestada ja kustutada antud kohtumise?"
 
-#: calendar/gui/dialogs/cancel-comp.c:65
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Kas sa t�esti soovid katkestada ja kustutada antud �lesande?"
 
-#: calendar/gui/dialogs/cancel-comp.c:74
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:77
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Kas sa t�esti soovid katkestada ja kustutada antud p�eviku sissekande?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Antud s�ndmus on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Antud �lesanne on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Antud p�eviku sissekanne on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sa ei muutnud midagi. Kas sulgeda aken?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Antud s�ndmust on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Antud �lesannet on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Antud p�eviku sissekannet on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  On tehtud muudatusi.  Kas t�histada need muudatused ja uuendada "
 "redaktorit?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Muudatusi ei ole tehtud. Kas v�rskendada redaktorit?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Tundmatu viga: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " kuni "
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 msgid "Completed "
 msgstr "L�petatud "
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr " (T�htaeg "
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr "T�htaeg "
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Ei saanud uuendada objekti!"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
 #, fuzzy
 msgid "Could not update object"
 msgstr "Ei saanud uuendada objekti!"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Muuda s�ndmust"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "S�ndmus - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "�lesanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "P�eviku sissekanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Kokkuv�te puudub"
 
-#: calendar/gui/dialogs/comp-editor.c:1221
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
-#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr "Salvesta kui..."
 
-#: calendar/gui/dialogs/comp-editor.c:1322
-#: calendar/gui/dialogs/comp-editor.c:1346
-#: calendar/gui/dialogs/comp-editor.c:1370
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1331
+#: calendar/gui/dialogs/comp-editor.c:1355
+#: calendar/gui/dialogs/comp-editor.c:1379
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4593,87 +4715,100 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "S�ndmus"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Meeldetuletaja"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:433
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr "Planeering"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Kohtumine"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
+#, fuzzy
+msgid "Start date is wrong"
+msgstr "Algab kuup�eval"
+
+#: calendar/gui/dialogs/event-page.c:610
+msgid "End date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:633
+#, fuzzy
+msgid "Start time is wrong"
+msgstr "_Algus:"
+
+#: calendar/gui/dialogs/event-page.c:640
+msgid "End time is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "Kestab kogu _p�eva"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "_H�ivatud"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Liigitamine"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "_Salajane"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Kuup�ev ja kellaaeg"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "Va_ba"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "As_ukoht:"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "_Isiklik"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "A_valik"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "N�ita aega kui"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "K_okkuv�te:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Kontaktid..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "_L�pp:"
@@ -4682,19 +4817,23 @@ msgstr "_L�pp:"
 msgid "_Start time:"
 msgstr "_Algus:"
 
-#: calendar/gui/dialogs/meeting-page.c:414
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr "Organiseerija peab olema m��rtud."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "V�hemalt �ks osaleja peab olema m�rgitud."
 
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "See isik on juba osav�tja!"
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Delegeerida..."
 
@@ -4734,16 +4873,11 @@ msgid "Member"
 msgstr "Liige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Roll"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
@@ -4751,13 +4885,6 @@ msgstr "Roll"
 msgid "Status"
 msgstr "Olek"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "T��p"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4768,106 +4895,87 @@ msgid "_Change Organizer"
 msgstr "_Muuda organiseerijat:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr "_Kustu teisi..."
 
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-#, fuzzy
-msgid "st"
-msgstr "1."
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:75
 #, fuzzy
-msgid "nd"
-msgstr "2."
+msgid "This and Future Instances"
+msgstr "Wallis ja Futuna"
 
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
+#: calendar/gui/dialogs/recur-comp.c:77
 #, fuzzy
-msgid "rd"
-msgstr "3."
+msgid "All Instances"
+msgstr "_K�ik ilmajaamad:"
 
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-msgid "th"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "See s�ndmus sisaldab ressursse, mida Evolution ei saa muuta."
 
-#: calendar/gui/dialogs/recurrence-page.c:898
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "j�rgnevatel n�dalap�evadel:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 #, fuzzy
 msgid "first"
 msgstr "nimekiri"
 
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
 #, fuzzy
 msgid "third"
 msgstr "Muu"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 #, fuzzy
 msgid "fourth"
 msgstr "P�hjast"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 #, fuzzy
 msgid "last"
 msgstr "nimekiri"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 #, fuzzy
 msgid "Other Date"
 msgstr "Muu faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "kuup�ev"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "iga"
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "korda"
 
@@ -4932,24 +5040,29 @@ msgstr "n�dal(at)"
 msgid "year(s)"
 msgstr "aasta(t)"
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:58
 #, fuzzy
 msgid "The meeting information has been created. Send it?"
 msgstr "Kohtumise infot on muudetud. Kas soovid saata uuendatud versiooni?"
 
-#: calendar/gui/dialogs/send-comp.c:59
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Kohtumise infot on muudetud. Kas soovid saata uuendatud versiooni?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:68
 #, fuzzy
 msgid "The task assignment information has been created. Send it?"
 msgstr "�lesande infot on muudetud. Kas soovid saata uuendatud versiooni?"
 
-#: calendar/gui/dialogs/send-comp.c:70
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr "�lesande infot on muudetud. Kas soovid saata uuendatud versiooni?"
 
+#: calendar/gui/dialogs/task-details-page.c:397
+#, fuzzy
+msgid "Completed date is wrong"
+msgstr "L�petatud "
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -4960,42 +5073,40 @@ msgstr "valmis (%)"
 msgid "Date Completed:"
 msgstr "L�petamise p�ev:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
-msgid "Needs Action"
-msgstr "Vajab tegevust"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Edenemine"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:860
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "T�_htsus:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Olek:"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "P�hiline"
 
-#: calendar/gui/dialogs/task-editor.c:216
-#: calendar/gui/dialogs/task-editor.c:261
-#: calendar/gui/dialogs/task-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr "Kellele m��ratud"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
+#: calendar/gui/dialogs/task-page.c:527
+msgid "Due date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Kirjeldus:"
 
@@ -5003,139 +5114,236 @@ msgstr "Kirjeldus:"
 msgid "Sta_rt Date:"
 msgstr "_Alguskuup�ev:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Kontaktid..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_T�htaeg:"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d p�eva"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 p�ev"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d n�dalat"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 n�dal"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d tundi"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 tund"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutit"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 minut"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekundit"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 sekund"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Saada s�num"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Teostatakse tundmatu tegevus"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s enne s�ndmuse algust"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s p�rast s�ndmuse algust"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s s�ndmuse alguses"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s enne s�ndmuse l�ppu"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s p�rast s�ndmuse l�ppu"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s s�ndmuse l�pus"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s tundmatule trigeri t��bile"
+
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:418
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:419
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:420
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:421
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:422
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:423
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-calendar-table.c:424
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-calendar-table.c:425
 #, fuzzy, c-format
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
-#: calendar/gui/e-week-view.c:1917
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1910
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
-#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
-#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "A_va"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 #, fuzzy
 msgid "_Save as..."
 msgstr "Salvesta kui..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
-#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Tr�ki..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
-#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_L�ika"
 
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
-#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
-#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 #, fuzzy
 msgid "_Assign Task"
 msgstr "M��ra �lesanne"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "_M�rgi l�petatuks"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_M�rgi �lesanded l�petatuks"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud �lesanded"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
-#: calendar/gui/e-week-view.c:4240
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: calendar/gui/e-calendar-table.c:1360
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "�lesande lisamiseks vajuta siia"
@@ -5144,8 +5352,8 @@ msgstr "�lesande lisamiseks vajuta siia"
 msgid "Alarms"
 msgstr "Alarmid"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1096
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "L�petatud"
 
@@ -5174,8 +5382,8 @@ msgid "Start Date"
 msgstr "Algab kuup�eval"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:748
-#: shell/e-shortcuts.c:1051
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Kokkuv�te"
 
@@ -5183,19 +5391,15 @@ msgstr "Kokkuv�te"
 msgid "Task sort"
 msgstr "�lesannete sorteerimine"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:166
+#: e-util/e-time-utils.c:379
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:161
+#: e-util/e-time-utils.c:388
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -5210,139 +5414,218 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:518
+#: calendar/gui/e-day-view-time-item.c:529
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
 msgid "pm"
 msgstr "pl"
 
-#: calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Uus _s�ndmus"
 
-#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "Uus kogu p�eva _s�ndmus"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 #, fuzzy
 msgid "New Meeting"
 msgstr "Kohtumine"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "Uus �lesanne"
 
-#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tr�ki"
 
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Mine t�nasele _p�evale"
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "_Mine kuup�evale..."
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publitseeri vaba/h�ivatud infot"
 
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "_S�numite s�tted..."
 
-#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
-#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Ajasta kohtumine"
 
-#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr "M�rgi see s�ndmus _nihutatavaks"
 
-#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta see s�ndmus"
 
-#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_�ik s�ndmused"
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "Li_htne kordus"
+
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "Vahemikuga"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d p�eva"
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "Vahemikuga"
+
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr "%d n�dalat"
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Every week on "
+msgstr "Evergreen"
+
+#: calendar/gui/e-itip-control.c:731
+#, fuzzy, c-format
+msgid "Every %d weeks on "
+msgstr "%d n�dalat"
+
+#: calendar/gui/e-itip-control.c:739
+#, fuzzy
+msgid " and "
+msgstr "Liiv"
+
+#: calendar/gui/e-itip-control.c:746
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:764
+#, fuzzy
+msgid "every month"
+msgstr "�hte _kuud"
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:775
+#, fuzzy
+msgid "Every year"
+msgstr "Vahemikuga"
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:831
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "L�pp: <b>"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "L�petatud "
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "iKalendri informatsioon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
-#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5350,350 +5633,351 @@ msgstr ""
 "<br> Palun vaata j�rgnev info �le ja vali allpool olevast men��st endale "
 "sobilik tegevus."
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Puudub</i>"
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Location:"
 msgstr "As_ukoht:"
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
 #, fuzzy
 msgid "Status:"
 msgstr "_Olek:"
 
-#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:490
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Vastu v�etud"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Proovin�usolek"
 
-#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Tagasi l�katud"
 
-#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
-#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:444
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Uuenda"
 
-#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Olgu"
 
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "N�ustu"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Proovin�usolek"
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "L�kka tagasi"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Vaba/h�ivatud info saatmine"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Saadab v�rskeima informatsiooni"
 
-#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
-#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "T�hista"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publitseeris kohtumise info."
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Kohtumise info"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1326
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> soovib saada sinu kohalolekut kohtumisel."
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> soovib saada sinu kohalolekut kohtumisel."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Ettepanek kohtumiseks"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1333
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> soovib saada v�rskeimat infot kohtumise kohta."
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Kohtumise info uuendus"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> soovib saada v�rskeimat infot kohtumise kohta."
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Soov muuta kohtumist"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> vastas kohtumise p�ringule."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Kohtumise vastus"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> t�histas kohtumise."
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Kokkusaamise t�histamine"
 
-#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
-#: calendar/gui/e-itip-control.c:1245
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> t�histas kohtumise."
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Vigane kohtmise s�num"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avalikustas �lesande info."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "�lesande info"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1393
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> soovib, et sa t�idaksid �lesande."
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> soovib, et sa t�idaksid �lesande."
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Ettepanek �lesandeks"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1400
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> soovib saada v�rskeimat infot �lesande kohta."
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "�lesande uuendus"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> soovib saada v�rskeimat infot �lesande kohta."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Soov muuta �lesannet"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> vastas �lesande m��ramisele."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "�lesande vastus"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> katkestas �lesande."
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "�lesande t�histamine"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Vigane �lesande s�num"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> avalikustas vaba/h�ivatud info."
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Vaba/h�ivatud info"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> soovib saada sinu vaba/h�ivatud infot."
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/h�ivatud infot"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> vastas vaba/h�ivatud p�ringule."
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Vaba/h�ivatud vastus"
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/h�ivatud s�num"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1541
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "S�num ei tundu olevalt �igesti vormistatud"
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "S�num sisaldab ainult toetamata p�ringuid."
 
-#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: calendar/gui/e-itip-control.c:1441
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
 
-#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Kirje saatmine eba�nnestus!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1916
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Uuendamine l�petatud\n"
 
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendrifaili ei saa uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Osav�tja olekut ei olnud v�imailk uuendada, kuna objekti enam ei eksisteeri"
 
-#: calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1739
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Osav�tja olekut ei ole v�imailk uuendada, kuna selle olek on vigane!\n"
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:2008
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Osav�tja olek uuendatud\n"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Osav�tja olekut ei ole v�imailk uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Eemaldamine l�petatud"
 
-#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr "Kirje saatmine eba�nnestus!\n"
 
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2206
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Vali kaust"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vali kaust"
@@ -5735,224 +6019,228 @@ msgstr "l�ppkuup."
 msgid "date-start"
 msgstr "alguskuup."
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Juhid"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr "Vajalikud osalejad"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "V�imalikud osalejad"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Resources"
 msgstr "Ressurss"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr "Individuaalne"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:831
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "Grupp"
 
-#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "Ressurss"
 
-#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr "Ruum"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr "Juht"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr "N�utav osaleja"
 
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
+#: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr "V�imalik osav�tja"
 
-#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
+#: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+msgid "Needs Action"
+msgstr "Vajab tegevust"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr "Katseline"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:879
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr "Delegeeritud"
 
-#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 msgid "In Process"
 msgstr "T��s"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2114
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
+#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Kontorist v�ljas"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Info puudub"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_H��lestus"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "N�ita tunde _t��p�eva piires"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 #, fuzzy
 msgid "Show _Zoomed Out"
 msgstr "N�ita kontsentreeritult"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_V�rskenda vaba/h�ivatud"
 
-#: calendar/gui/e-meeting-time-sel.c:544
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr "_Automaatne valik"
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr "_K�ik inimesed ja ressursid"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "K�ik _inimesed ja �ks ressurss"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "_Vajalikud inimesed"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Vajalikud inimesed ja _�ks ressurss"
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Kohtumise _algus:"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Kohtumise l_�pp:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
 #: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan %s �lesanded"
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ei saa laadida '%s' �lesandeid"
 
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' laadimiseks vajalik meetod ei ole toetatud."
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Viga %s k�ivitamisel"
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "L�petamise kuup�ev"
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 #, fuzzy
 msgid "Expunging"
 msgstr "T�hjendan kausta"
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Uus _s�ndmus..."
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/gnome-cal.c:1541
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' avamiseks vajalik meetod on toetamata"
 
-#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1581
+#: calendar/gui/gnome-cal.c:1563
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarm %s"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5960,7 +6248,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5968,7 +6256,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1996
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Avan %s kalendri"
@@ -6034,320 +6322,177 @@ msgstr "Oktoober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr "Organiseerija peab olema m��rtud."
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Vaja on v�hemalt �hte osav�tjat"
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "Teave s�ndmuse kohta"
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "Teave �lesande kohta"
 
 # !PARANDA! - siia peaks leidma s�na, mis ei oleks eitav
-#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 #, fuzzy
 msgid "Journal information"
 msgstr "Mittekohustuslik info"
 
-#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "Vaba/H�ivatud informatsioon"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Kalendri info"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 #, fuzzy
 msgid "Updated"
 msgstr "Uuenda"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
 #, fuzzy
 msgid "Refresh"
 msgstr "V�rskenda nimekirja"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vaba/H�ivatud informatsioon (%s - %s)"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "iKalendri informatsioon"
 
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema s�ndmusest osav�tja."
 
-#: calendar/gui/main.c:70
-#, fuzzy
-msgid "Could not activate Bonobo"
-msgstr "Ei saa laadida Bonobot"
-
-#: calendar/gui/main.c:99
-msgid "Could not create the component editor factory"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:456
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:456
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:456
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:456
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:457
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:457
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:457
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:457
-msgid "9th"
-msgstr "9."
-
-#: calendar/gui/print.c:457
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:458
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:458
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:458
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:458
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:458
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:459
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:459
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:459
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:459
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:459
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:460
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:460
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:460
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:460
-msgid "24th"
-msgstr "24."
-
-#: calendar/gui/print.c:460
-msgid "25th"
-msgstr "25."
-
-#: calendar/gui/print.c:461
-msgid "26th"
-msgstr "26."
-
-#: calendar/gui/print.c:461
-msgid "27th"
-msgstr "27."
-
-#: calendar/gui/print.c:461
-msgid "28th"
-msgstr "28."
-
-#: calendar/gui/print.c:461
-msgid "29th"
-msgstr "29."
-
-#: calendar/gui/print.c:461
-msgid "30th"
-msgstr "30."
-
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "P"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "E"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "T"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "K"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "N"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "R"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "L"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valitud p�ev (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
-#: calendar/gui/print.c:1896
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valitud n�dal (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Valitud kuu (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Valitud aasta (%Y)"
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "�lesanne"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "Olek: %s"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "T�_htsus:"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%): %i"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2364
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategooriad: %s"
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Tr�ki kalender"
-
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
-#: my-evolution/e-summary.c:633
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "Tr�kkimise eelvaade"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Tr�ki kirje"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Tr�kkimise s�tted"
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Ei suutnud tekitada �lesannete vaadet.  Kontrolli oma ORBit ja OAF "
-"seadistust."
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "Kuvatava �lesannete kausta URI"
 
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:472
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6360,96 +6505,57 @@ msgstr ""
 "\n"
 "Kas t�esti eemaldame kustutatud s�numid?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
-#: mail/mail-callbacks.c:2912
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "Seda k�simust rohkem mitte esitada."
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Tr�ki kaardid"
 
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-"Evolution t�stis sinu kalendrikaustas olnud �lesanded �le uude �lesannete "
-"kausta."
-
-#: calendar/gui/tasks-migrate.c:108
-#, fuzzy
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-"Evolution �ritas t�sta sinu kalendrikaustas olnud �lesandeid �le uude "
-"�lesannete kausta.\n"
-"M�nda �lesannetest ei �nnestunud �mber t�sta. Seda operatsiooni v�ib "
-"tulevikus uuesti �ritada."
-
-#: calendar/gui/tasks-migrate.c:120
-#, fuzzy, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-"`%s' ei suudetud avada, �htegi elementi kalendrikaustast �le kanda ei saanud."
-
-#: calendar/gui/tasks-migrate.c:133
-#, fuzzy, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-"`%s' laadimiseks vajalik meetod puudub. �htegi elementi kalendrikaustast �le "
-"kanda ei ole v�imalik."
-
-#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
 msgid "SMTWTFS"
 msgstr "PETKNRL"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+# !PARANDA!
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Impordib VKaardi-vormingus failid Evolution'i."
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution'i kalendri iTip/iMip vaataja"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+# !PARANDA!
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 #, fuzzy
-msgid "Imports iCalendar files into Evolution"
-msgstr "Impordib VKaardi-vormingus failid Evolution'i."
+msgid "Evolution iCalendar importer"
+msgstr "Evolution'i kalendri iTip/iMip vaataja"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+# !PARANDA!
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 #, fuzzy
-msgid "Imports vCalendar files into Evolution"
-msgstr "Impordib VKaardi-vormingus failid Evolution'i."
+msgid "Evolution vCalendar importer"
+msgstr "Evolution'i kalendri iTip/iMip vaataja"
 
-#: calendar/importers/icalendar-importer.c:168
-#, fuzzy, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr ""
-"Ei saa k�tte s�numit %s kaustast %s\n"
-"  %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Kalendri s�num"
 
-#: calendar/importers/icalendar-importer.c:180
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:483
+#: calendar/importers/icalendar-importer.c:404
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Meeldetuletaja"
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalendri s�num"
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:663
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6458,11 +6564,15 @@ msgstr ""
 "Evolution leidis Pine postifaile.\n"
 "Kas sa soovid neid Evolutionisse importida?"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalender"
 
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now n�uab 0 argumenti"
@@ -8106,30 +8216,40 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "See �iffer ei toeta allkirjastamist"
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "See �iffer ei toeta kontrolli"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "See �iffer ei toeta kr�pteerimist"
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "See �iffer ei toeta dekr�pteerimist"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "See �iffer ei toeta dekr�pteerimist"
+
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "See �iffer ei toeta dekr�pteerimist"
+
+#: camel/camel-data-cache.c:133
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr ""
 "V�ljundfaili loomine nurjus: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ei suuda avada puhverkataloogi: %s"
@@ -8169,87 +8289,94 @@ msgstr "S�ilitan Kausta '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Selle operatsiooni t�itmiseks pead olema onlainis"
 
-#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "S�numi %s puhverdamine eba�nnestus: %s"
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-process.c:92
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "S�numi %s puhverdamine eba�nnestus: %s"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Ei saa luua kataloogi %s: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Kaustade s�nkroniseerimine"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Viga filtri anal��sil: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Viga filtri t�itmisel: %s: %s"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Puhverkausta pole v�imalik avada"
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Puhverkausta pole v�imalik t��delda"
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "V�etakse vastu teadet %d (%d%%)"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "S�numi avamine eba�nnestus"
 
-#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nurjumine teate %d juures"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Kausta s�nkroniseerimine"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "T�mban %d. s�numit %dst"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d. teate juures %d'st tekkis viga"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "S�numi lahtikr�ptimine eba�nnestus."
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Vigased argumendid"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Vigased argumendid"
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "S�numi %s puhverdamine eba�nnestus: %s"
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "S�numi %s puhverdamine eba�nnestus: %s"
-
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Viga filtri abil otsimisel %s: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8258,7 +8385,7 @@ msgstr ""
 "Otsinguavaldist ei ole v�imalik anal��sida: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8267,12 +8394,12 @@ msgstr ""
 "Viga otsinguavaldise t�itmisel: %s: \n"
 "%s"
 
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 #, fuzzy
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) n�uab �htainust t�ev��rtust��pi tulemust"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, fuzzy, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "T�idetakse p�ring tundmatul p�isel: %s"
@@ -8301,7 +8428,7 @@ msgstr "S�numite liigutamine"
 msgid "Copying messages"
 msgstr "S�numite liigutamine"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8309,71 +8436,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:711
+#: camel/camel-gpg-context.c:738
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:761
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:769
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
-#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
-#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr "Katkestatud."
 
-#: camel/camel-gpg-context.c:771
+#: camel/camel-gpg-context.c:798
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ootamatu vastus POP serverilt: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ei saa kr�ptida s�numit: saajate aadressid on m��ramata."
 
-#: camel/camel-gpg-context.c:1082
+#: camel/camel-gpg-context.c:1125
 #, fuzzy, c-format
 msgid ""
-"Failed to GPG %s message: %s\n"
+"Failed to GPG %s: %s\n"
 "\n"
 "%.*s"
 msgstr "S�numi %s puhverdamine eba�nnestus: %s"
 
-#: camel/camel-gpg-context.c:1088
+#: camel/camel-gpg-context.c:1131
 #, fuzzy, c-format
-msgid "Failed to GPG %s message: %s\n"
+msgid "Failed to GPG %s: %s\n"
 msgstr "S�numi %s puhverdamine eba�nnestus: %s"
 
-#: camel/camel-gpg-context.c:1197
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "S�numi lahtikr�ptimine eba�nnestus."
 
-#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
-#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
-#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "S�numi lahtikr�ptimine eba�nnestus."
 
-#: camel/camel-gpg-context.c:1290
+#: camel/camel-gpg-context.c:1333
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Ei saa kontrollida s�numit: Ajutise faili loomine eba�nnestus: %s"
@@ -8398,23 +8526,22 @@ msgstr "'%s' ei �nnestnud lukustada, protokolli viga lukustamisabilises"
 msgid "Could not lock '%s'"
 msgstr "'%s' ei �nnestnud lukustada"
 
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:93 camel/camel-lock.c:112
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, fuzzy, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Lukufaili ei �nnestunud luua - %s: %s"
 
-#: camel/camel-lock.c:152
+#: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "%s - Lukufaili saamise p�ring �letas ajapiirangu. �rita hiljem uuesti."
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2) abil lukustamine nurjus: %s"
 
-#: camel/camel-lock.c:268
+#: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) abil lukustamine nurjus: %s"
@@ -8424,51 +8551,51 @@ msgstr "flock(2) abil lukustamine nurjus: %s"
 msgid "Could not check mail file %s: %s"
 msgstr "Ei saa kontrollida postifaili %s: %s"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Ei saa avada postifaili %s: %s"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Ei saa avada ajutist postifaili %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:157
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Eba�nnestud posti salvestamine ajutisse faili %s: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Toru loomine eba�nnestus: %s"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Haruprotsessi pole v�imalik tekitada: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail programm eba�nnestus: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(Tundmatu viga)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Viga postifaili lugemisel: %s"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Viga ajutise postifaili kirjutamisel: %s"
 
-#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Viga ajutise postifaili kopeerimisel: %s"
@@ -8485,26 +8612,26 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr "See on s�numi digitaalselt allkirjastatud osa"
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 #, fuzzy
 msgid "parse error"
 msgstr "Muu viga"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Ei saa laadida %s: s�steem ei toeta moodulite laadimist."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Ei saa laadida %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ei saa laadida %s: moodulis puudub initsialiseerimiskood."
@@ -8558,11 +8685,11 @@ msgstr ""
 "See seadistus aitab juhul, kui server seda toetab, �henduda serverisse "
 "kasutades turvalist CRAM-MD5 parooli."
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8570,39 +8697,115 @@ msgstr ""
 "See seadistus aitab juhul, kui server seda toetab, �henduda serverisse "
 "kasutades turvalist DIGEST-MD5 parooli."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Serveri kutsung liiga pikk (>2048 oktetti)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Vigane serveri kutsung\n"
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr "Serveri kutsung sisaldas vigast \"Quality of Protection\" lipikut\n"
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr "Serveri vastus ei sisaldanud autoriseerimisinfot\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Serveri vastus sisaldas puudulikku autoriseerimisinfot\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "Serveri vastus oli vigane\n"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-gssapi.c:48
+msgid "GSSAPI"
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:50
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr "See valik loob �henduse serverisse kasutades Kerberos 4 autentimist."
+
+#: camel/camel-sasl-gssapi.c:148
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:153
+msgid "The provided target_name parameter was ill-formed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:156
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:160
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:165
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:169
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:180
+msgid "The consistency checks performed on the credential failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:183
+msgid "The referenced credentials have expired."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
+msgid "Bad authentication response from server."
+msgstr "Serverilt saadi vigane autentimise vastus."
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "S�numi %s puhverdamine eba�nnestus: %s"
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Toetamata t��p"
+
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "See valik loob �henduse serverisse kasutades Kerberos 4 autentimist."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8611,11 +8814,6 @@ msgstr ""
 "Kerberose pileti saamine eba�nnestus:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr "Serverilt saadi vigane autentimise vastus."
-
 #: camel/camel-sasl-login.c:32
 #, fuzzy
 msgid "Login"
@@ -8664,7 +8862,7 @@ msgstr ""
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regulaaravaldise kompileerimine nurjus: %s: %s"
@@ -8684,37 +8882,37 @@ msgstr "URL '%s' vajab hosti osa"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vajab kataloogitee osa"
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "Lahendan: %s"
 
-#: camel/camel-service.c:774 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Viga nime lahendamisel: %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Hostinime lahendamine eba�nnestus: %s: ei leia hosti"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Hostinime lahendamine eba�nnestus: %s: p�hjus teadmata"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 #, fuzzy
 msgid "Resolving address"
 msgstr "Lahendan: %s"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Hostinime lahendamine eba�nnestus: %s: ei leia hosti"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Hostinime lahendamine eba�nnestus: %s: p�hjus teadmata"
@@ -8727,12 +8925,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:354 camel/camel-session.c:422
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8741,179 +8939,179 @@ msgstr ""
 "Kataloogi %s loomine nurjus:\n"
 "%s"
 
-#: camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:171
 #, c-format
 msgid "Please enter your password for %s"
 msgstr "Palun sisesta oma %s parool"
 
-#: camel/camel-smime-context.c:203
+#: camel/camel-smime-context.c:201
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "Sertifikaati \"%s\" allkirja jaoks ei ole olemas."
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Sertifikaati \"%s\" kr�pteerimise jaoks ei ole olemas."
 
-#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
+#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "Sertifikaadi leidmine \"%s\" jaoks nurjus."
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr ""
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 msgid "Failed to decode message."
 msgstr "S�numi lahtikr�ptimine eba�nnestus."
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr "Sertifikaatide kontroll eba�nnestus."
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Sertifikaatide kontroll eba�nnestus."
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 #, fuzzy
 msgid "Unable to decrypt certificate signature"
 msgstr "Sertifikaatide kontroll eba�nnestus."
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Allkirjafail"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 #, fuzzy
 msgid "Certificate has expired"
 msgstr "_Sertifikaadi ID:"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 #, fuzzy
 msgid "Error in CRL"
 msgstr "Viga %s laadimisel"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 #, fuzzy
 msgid "Out of memory"
 msgstr "Kontorist v�ljas"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 #, fuzzy
 msgid "Unable to verify leaf signature"
 msgstr "Sertifikaatide kontroll eba�nnestus."
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 #, fuzzy
 msgid "Certificate Revoked"
 msgstr "_Sertifikaadi ID:"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 #, fuzzy
 msgid "Invalid purpose"
 msgstr "Vigane parameeter"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "_Sertifikaadi ID:"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "_Sertifikaadi ID:"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8922,15 +9120,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8943,7 +9141,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:690
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8953,35 +9151,35 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:734
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:786
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:804
+#: camel/camel-tcp-stream-ssl.c:947
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "_Sertifikaadi ID:"
 
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:964
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr "_Sertifikaadi ID:"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -8996,40 +9194,40 @@ msgstr "Viga %s k�ivitamisel"
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kontrolli uusi s�numeid k�ikides kaustades"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kausta kustutamine nurjus: %s: kausta ei ole olemas"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kausta �mbernimetamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2611
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "Operatsioon katekstatud"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2614
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server katkestas ootamatult: %s"
@@ -9052,52 +9250,52 @@ msgstr "Ootamatu vastus IMAP serverilt: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAPi k�sk eba�nnestus: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "Serveri vastus l�ppes liiga vara."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:655
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:691
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ootamatu OK vastus IMAP serverilt: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:221
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ei saa luua kataloogi %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:240
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ei saa laadida %s kokkuv�tet"
 
-#: camel/providers/imap/camel-imap-folder.c:306
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "Kaust h�vitati ja taasloodi serveris."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:548
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Kontrollin muudetud s�numite olemasolu"
 
-#: camel/providers/imap/camel-imap-folder.c:1872
+#: camel/providers/imap/camel-imap-folder.c:1873
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "S�numi lahtikr�ptimine eba�nnestus."
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9106,24 +9304,24 @@ msgstr ""
 "Ei saa k�tte s�numit: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "S�numit ei leitud"
 
-#: camel/providers/imap/camel-imap-folder.c:1931
-#: camel/providers/imap/camel-imap-folder.c:2527
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
 msgid "This message is not currently available"
 msgstr "See s�num ei ole hetkel k�ttesaadav"
 
-#: camel/providers/imap/camel-imap-folder.c:2191
-#: camel/providers/imap/camel-imap-folder.c:2261
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
 msgid "Fetching summary information for new messages"
 msgstr "V�tan kokkuv�tvat infot uute s�numite kohta"
 
-#: camel/providers/imap/camel-imap-folder.c:2565
+#: camel/providers/imap/camel-imap-folder.c:2567
 msgid "Could not find message body in FETCH response."
 msgstr "Ei leia s�numi sisu FETCH vastuses."
 
@@ -9153,7 +9351,7 @@ msgstr "Kontrollin uusi s�numeid"
 msgid "Check for new messages in all folders"
 msgstr "Kontrolli uusi s�numeid k�ikides kaustades"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "Kaustad"
 
@@ -9183,7 +9381,7 @@ msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Parool"
 
@@ -9201,62 +9399,61 @@ msgstr "SMTP server %s"
 msgid "IMAP service for %s on %s"
 msgstr "%s teenus %s jaoks %s peal"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr "�hendus katkestatud"
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ei saa �henduda %s (port: %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Ei saa luua �hendust POP serveriga.\n"
 "Viga kasutajanime saatmisel: %s"
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operatsioon ei ole toetatud"
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentimine eba�nnestus."
 
-#: camel/providers/imap/camel-imap-store.c:1082
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s ei toeta k�situd autentimist��pi %s"
 
-#: camel/providers/imap/camel-imap-store.c:1092
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentimist��bi %s tugi puudub"
 
-#: camel/providers/imap/camel-imap-store.c:1116
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPalun sisesta IMAP parool %s@%s jaoks"
 
-#: camel/providers/imap/camel-imap-store.c:1131
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Sa ei sisestanud parooli."
 
-#: camel/providers/imap/camel-imap-store.c:1160
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9264,24 +9461,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1462
-#: camel/providers/imap/camel-imap-store.c:1604
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1839
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Kausta nimi ei tohi sisaldada Return s�mbolit"
 
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1851
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Tundmatu viga: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9360,8 +9557,8 @@ msgstr ""
 "puhverfailides"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -9373,36 +9570,36 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Kohaliku posti fail %s"
 
-#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ei saa muuda kausta %s nime %s-ks: %s"
 
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kausta �mbernimetamine eba�nnestus: %s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Ei saa kustutada kausta kokkuv�ttefaili '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:394
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ei saa kustutada kausta indeksfaili '%s': %s"
@@ -9412,7 +9609,7 @@ msgstr "Ei saa kustutada kausta indeksfaili '%s': %s"
 msgid "Could not save summary: %s: %s"
 msgstr "Ei saa salvestada kokkuv�tet: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:454
+#: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9425,14 +9622,14 @@ msgstr ""
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "S�numi lisamine maildir kausta nurjus: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr "Vigane s�numi sisu"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9444,14 +9641,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Kausta '%s' ei ole olemas."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:168
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9466,70 +9663,70 @@ msgid "`%s' is not a maildir directory."
 msgstr "`%s' ei ole maildir vormingus kataloog."
 
 #: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-maildir-store.c:205
 #: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ei saa kustutada kausta '%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr "ei ole maildir vormingus kataloog"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:282
-#: camel/providers/local/camel-spool-store.c:312
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ei saa lugeda kausta '%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:416
-#: camel/providers/local/camel-maildir-summary.c:545
+#: camel/providers/local/camel-maildir-summary.c:417
+#: camel/providers/local/camel-maildir-summary.c:548
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Kontrollin uusi s�numeid"
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Kontrollin uute s�numite olemasolu"
 
-#: camel/providers/local/camel-maildir-summary.c:729
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:583
-#: camel/providers/local/camel-mbox-summary.c:673
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Kausta s�ilitamine"
 
-#: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s lukustamine nurjus: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:396
-#: camel/providers/local/camel-mbox-folder.c:404
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9538,11 +9735,11 @@ msgstr ""
 "Ei saa k�tte s�numit %s kaustast %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -9585,75 +9782,75 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Kaust '%s' ei ole t�hi, j�tan kustutamata."
 
-#: camel/providers/local/camel-mbox-summary.c:350
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ei saa avada kausta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:398
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:453
+#: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ei saa kontrollida kausta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:678
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ei saa avada faili: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-spool-summary.c:169
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ei saa avada ajutist kirjakasti: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-mbox-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:621
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Ajutise kausta sulgemine eba�nnestus: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kausta �mbernimetamine eba�nnestus: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:716
-#: camel/providers/local/camel-mbox-summary.c:724
-#: camel/providers/local/camel-mbox-summary.c:913
-#: camel/providers/local/camel-mbox-summary.c:921
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:848
-#: camel/providers/local/camel-spool-summary.c:332
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tundmatu viga: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:812
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Kausta �mbernimetamine eba�nnestus: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:976
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Viga ajutise kirjakasti kirjutamisel: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:993
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Ajutisse kirjakasti kirjutamine eba�nnestus: %s: %s"
@@ -9672,67 +9869,67 @@ msgstr "S�numi lisamine mh vormingus kausta nurjus: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "'%s' ei ole kataloog"
 
-#: camel/providers/local/camel-mh-summary.c:243
+#: camel/providers/local/camel-mh-summary.c:244
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "`%s' ei ole maildir vormingus kataloog."
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Kausta '%s/%s' ei ole olemas."
 
-#: camel/providers/local/camel-spool-store.c:176
+#: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' ei ole tavaline fail."
 
-#: camel/providers/local/camel-spool-store.c:193
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "S�ilitan Kausta '%s'"
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:181
-#: camel/providers/local/camel-spool-summary.c:190
-#: camel/providers/local/camel-spool-summary.c:199
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Ei saa s�nkroniseerida ajutist kausta %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:214
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:244
-#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
 #: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
@@ -9810,45 +10007,45 @@ msgid "Retrieving POP summary"
 msgstr "V�tan vastu POP kokkuv�tet"
 
 #: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:427
-#: camel/providers/pop3/camel-pop3-folder.c:486
-#: camel/providers/pop3/camel-pop3-folder.c:503
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
 #, fuzzy
 msgid "User cancelled"
 msgstr "Operatsioon katekstatud"
 
-#: camel/providers/pop3/camel-pop3-folder.c:264
+#: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ei saa salvestada kokkuv�tet: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr "H�vitan kustutatud s�numid"
 
-#: camel/providers/pop3/camel-pop3-folder.c:401
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:408
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "V�tan vastu POP s�numit nr %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:488
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "Ei saa k�tte s�numit: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Teadmata sademed"
@@ -9866,7 +10063,7 @@ msgstr "J�ta s�numid serverisse"
 msgid "Delete after %s day(s)"
 msgstr "Kustuta %s p�eva m��dumisel"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -9887,44 +10084,44 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Ei saa �henduda %s (port: %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Ei saa luua �hendust POP serveriga.\n"
 "Viga kasutajanime saatmisel: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
 msgstr "�henduse loomine POP serveriga nurjus: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "SMTP server %s ei toeta k�situd autentimist��pi %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "IMAPi k�sk eba�nnestus: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
@@ -9932,13 +10129,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPalun sisesta %s@%s POP3 parool"
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9947,13 +10144,13 @@ msgstr ""
 "Ei saa luua �hendust POP serveriga.\n"
 "Viga parooli saatmisel: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:614
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Kausta '%s' ei ole olemas."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9963,51 +10160,51 @@ msgid ""
 "system."
 msgstr "E-posti saatmiseks kohaliku s�steemi programmi \"sendmail\" abil."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 #, fuzzy
 msgid "Could not parse recipient list"
 msgstr "Toru loomine eba�nnestus: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Ei saa luua toru sendmailiga: %s: s�numit ei saadetud"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 "Sendmail'i haruprotsessi pole v�imalik tekitada: %s: e-post j�i saatmata"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Ei saa saata s�numit: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail l�petas t�� signaaliga %s: s�numit ei saadetud."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Ei saa k�ivitada %s: s�numit ei saadetud."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail l�petas t�� staatusega %d: s�numit ei saadetud."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr "S�numite trantsport sendmail programmiga"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10015,140 +10212,140 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "E-posti saatmiseks SMTP protokolli abil l�bi v�rgus oleva mailhub'i.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Abis�num"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Teenus on valmis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Teenus sulgeb �lekandekanali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Teenus ei ole saadaval, sulgen �lekandekanali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Autentimise mehhanism on liiga n�rk"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Ajutine autentimine eba�nnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Autentimine on vajalik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 #, fuzzy
 msgid "Welcome response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Ei saa luua �hendust POP serveriga.\n"
 "Viga kasutajanime saatmisel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:342
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "S�num ei tundu olevalt �igesti vormistatud"
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP server %s ei toeta k�situd autentimist��pi %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPalun sisesta %s@%s SMTP parool"
@@ -10178,11 +10375,11 @@ msgstr "SMTP posti saatmine %s kaudu"
 msgid "Cannot send message: sender address not valid."
 msgstr "Ei saa saata s�numit: saatja aadress on vigane"
 
-#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "S�numi saatmine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "Ei saa saata s�numit: saajate aadressid on m��ramata."
 
@@ -10191,63 +10388,63 @@ msgstr "Ei saa saata s�numit: saajate aadressid on m��ramata."
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ei saa saata s�numit: saajate aadressid on m��ramata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "SMTP tervitus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "RSET p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "SMTP autentimine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Viga SASL autentimisobjekti loomise."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "AUTH p�ring nurjus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Halb autentimisvastus serverilt.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM p�ring �letas ajalimiidi: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM vastuse viga: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO p�ring �letas ajalimiidi: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA p�ring �letas ajalimiidi: %s: s�num j�i saatmata"
@@ -10255,82 +10452,82 @@ msgstr "DATA p�ring �letas ajalimiidi: %s: s�num j�i saatmata"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA saatmine �letas ajalimiidi: s�numi t�histamine: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Serverilt saadi vigane autentimise vastus."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET vastuse viga: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:102
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:113
+#: composer/e-msg-composer-attachment-bar.c:108
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "manus"
 
-#: composer/e-msg-composer-attachment-bar.c:520
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr "Eemalda valitud kirjed manuste nimekirjast"
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Lisa manus..."
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Lisa s�numile manus"
 
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Ei saa lisada faili manusesse: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:177
+#: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Ei saa lisada faili manusesse %s: see ei ole tavaline fail"
@@ -10348,11 +10545,15 @@ msgid "MIME type:"
 msgstr "MIME t��p:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:163
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr "Soovita manuse automaatset kuvamist"
 
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu vaatamiseks kliki siia"
 
@@ -10363,45 +10564,45 @@ msgstr "Aadressiraamatu vaatamiseks kliki siia"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:400
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Vastus:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Saatja:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Teema:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Adressaat:"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Sisesta s�numi adressaadid"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: composer/e-msg-composer-hdrs.c:436
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Sisesta aadressid, milledele saadetakse s�numi koopiad"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
-#: composer/e-msg-composer-hdrs.c:440
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10410,27 +10611,28 @@ msgstr "Sisesta aadressid, millele saadetakse s�numi pimekoopiad."
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "Kirjeldus puudub"
 
-#: composer/e-msg-composer-select-file.c:275
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
 msgstr "Lisab s�numile faili"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Ei saa salvestada allkirjafaili."
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10439,48 +10641,53 @@ msgstr ""
 "Viga faili %s lugemisel:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "Hoiatus!"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Fail on juba olemas. Kirjutada �le?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Viga faili salvestamisel: %s"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Viga faili laadimisel: %s"
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1285
+#, fuzzy, c-format
+msgid ""
+"Unable to copy file descriptor: %s\n"
+"%s"
+msgstr ""
+"V�ljundfaili loomine nurjus: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10489,7 +10696,7 @@ msgstr ""
 "Viga kirja automaatsel salvestamisel: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10497,7 +10704,7 @@ msgstr ""
 "Ximian Evolution leidis eelmisest sessioonist salvestamata faile.\n"
 "Kas sa soovid �ritada nende taastamist?"
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10508,34 +10715,39 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
-#: composer/e-msg-composer.c:1536
+#: composer/e-msg-composer.c:1555
+msgid "_Discard Changes"
+msgstr ""
+
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Hoiatus: salvestamata s�num"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Ava fail"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Signature:"
 msgstr "Allkirja salvestamine"
 
-#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "S�numi koostamine"
 
-#: composer/e-msg-composer.c:2796
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2822
+#: composer/e-msg-composer.c:2931
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10546,7 +10758,7 @@ msgstr ""
 "Ei saa luua s�numiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10554,23 +10766,12 @@ msgstr ""
 "Ei saa luua s�numiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
-#: composer/e-msg-composer.c:3858
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:393
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-
-#: composer/evolution-composer.c:408
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "Bonobo komponentide s�steemi l�htestamine nurjus"
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr ""
@@ -10619,8 +10820,111 @@ msgstr "Teema sisaldab"
 msgid "Subject does not contain"
 msgstr "Teema ei sisalda"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
-#: mail/mail-display.c:192
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:4
+#, fuzzy
+msgid "<b>Out of Office Message:</b>"
+msgstr "Kontorist v�ljas"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "_Olek:"
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:12
+#, fuzzy
+msgid "Out of Office Assistant"
+msgstr "Kontorist v�ljas"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "Olek"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "E-posti vastuv�tmine"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "E-posti saatmine"
+
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:9
+#, fuzzy
+msgid "Read Receipts"
+msgstr "Adressaadid"
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
+#: e-util/e-component-listener.c:128
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10628,214 +10932,240 @@ msgstr ""
 "Antud nimega fail eksisteerib.\n"
 "Kirjutada �le?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Kirjutada fail �le?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "J�ta see parool meelde"
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 #, fuzzy
 msgid "Sync Categories:"
 msgstr "Kategooriad"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:171 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:176 e-util/e-time-utils.c:375
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:181
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a, %d.%m.%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:186
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %d.%m.%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:197
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:201
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:206
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:216
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:221
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:325 e-util/e-time-utils.c:424
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:329 e-util/e-time-utils.c:416
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
+#: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
+#: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:342
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:181
-msgid "seconds"
-msgstr "sekundit"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 sekund"
 
-#: filter/filter-datespec.c:71
-msgid "minute"
-msgstr "minut"
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d sekundit"
 
-#: filter/filter-datespec.c:72
-msgid "hour"
-msgstr "tund"
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 minut"
 
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "n�dal"
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d minutit"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "n�dalat"
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 tund"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d tundi"
 
-#: filter/filter-datespec.c:75
-msgid "month"
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 p�ev"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr " tagasi"
+
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 n�dal"
+
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d n�dalat"
+
+#: filter/filter-datespec.c:70
+#, fuzzy
+msgid "1 month ago"
 msgstr "kuu"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
-msgstr "kuud"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr " tagasi"
 
-#: filter/filter-datespec.c:76
-msgid "year"
-msgstr "aasta"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "aastat"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr " tagasi"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 #, fuzzy
 msgid "You must choose a date."
 msgstr "Sa unustasid kuup�eva valimata."
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr "<kuup�eva valimiseks kliki siia>"
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "praegu"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:279
+#: filter/filter-datespec.c:285
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%a, %d. %b %Y"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
-#, fuzzy, c-format
-msgid "%d %s ago"
-msgstr " tagasi"
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Vali aeg, millega v�rrelda"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filtreerimisreeglid"
 
-#: filter/filter-file.c:178
+#: filter/filter-file.c:166
 #, fuzzy
-msgid "You must specify a file name"
+msgid "You must specify a file name."
 msgstr "Stiili nimi:"
 
-#: filter/filter-file.c:190
+#: filter/filter-file.c:184
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "'%s' ei ole kataloog"
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 #, fuzzy
 msgid "Choose a file"
 msgstr "Vali tegevus"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "Siis"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "Lisa tegevus"
-
-#: filter/filter-folder.c:149
+#: filter/filter-folder.c:155
 #, fuzzy
-msgid "You must specify a folder.\n"
+msgid "You must specify a folder."
 msgstr "Stiili nimi:"
 
-#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "Vali kaust"
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10844,79 +11174,77 @@ msgstr ""
 "Viga regulaaravaldises '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:62
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
 msgid "Important"
 msgstr "T�htis"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133
+#: filter/filter-label.c:122 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1281
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124
+#: filter/filter-label.c:124 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1283
 #, fuzzy
 msgid "Later"
 msgstr "p�rast"
 
-#: filter/filter-part.c:545 shell/evolution-test-component.c:49
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:223
+#: filter/filter-rule.c:219
 msgid "You must name this filter."
 msgstr "Sa pead sellele filtrile nime m��rama."
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Reegli nimi: "
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "Nimetu"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Kui"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "K�ivita tegevused"
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "kui k�ik tingimised on t�idetud"
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "kui m�ni tingimus on t�idetud"
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "Lisa tingimus"
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "sissetulev"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "v�ljaminev"
 
@@ -10968,7 +11296,7 @@ msgstr ""
 "S�numi kuup�eva v�rreldakse allpool\n"
 "m��ratud ajahetkega."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Virtuaalsed kaustad"
 
@@ -10980,6 +11308,14 @@ msgstr "ajaga, mis on suhteline k�esoleva hetkega"
 msgid "ago"
 msgstr "tagasi"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "kuud"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "sekundit"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "ainult kirjeldatud kaustad"
@@ -10997,6 +11333,10 @@ msgstr "m��ratud ajaga"
 msgid "vFolder Sources"
 msgstr "vKausta allikad"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "n�dalat"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "koos k�igi aktiivsete v�rgukaustadega"
@@ -11009,6 +11349,10 @@ msgstr "koos k�igi kohalike ja aktiivsete v�rgukaustadega"
 msgid "with all local folders"
 msgstr "koos k�igi kohalike kalatoogidega"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "aastat"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11141,7 +11485,7 @@ msgstr "ei ole"
 msgid "is not Flagged"
 msgstr "T�histatud"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
@@ -11172,7 +11516,7 @@ msgstr "Saada kontaktile s�num"
 msgid "Play Sound"
 msgstr "M�ngi heli:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr "Loetud"
 
@@ -11203,12 +11547,12 @@ msgstr "on suurem kui"
 msgid "returns less than"
 msgstr "on v�iksem kui"
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Skoor"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Saatja"
 
@@ -11245,8 +11589,9 @@ msgstr "algab"
 msgid "Stop Processing"
 msgstr "Peata t��tlemine"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Teema"
 
@@ -11255,68 +11600,84 @@ msgstr "Teema"
 msgid "Unset Status"
 msgstr "M��ra olek"
 
-#: filter/rule-editor.c:180
-msgid "Rules"
-msgstr "Reeglid"
-
-#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
 #, c-format
-msgid "Rule name '%s' is not unique, choose another"
+msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:170
+msgid "Rules"
+msgstr "Reeglid"
+
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Reegli lisamine"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "Reegli muutmine"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "Reegli nimi: "
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr "Skoori reeglid"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "Sa pead sellele vKaustale nime m��rama."
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "vKausta allikad"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution impordib sinu s�numeid programmist Elm'i"
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr "Impordin"
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr "Palun oota"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, c-format
 msgid "Scanning %s"
 msgstr "Kontrollin %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:353
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
 msgstr "Post"
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11324,7 +11685,7 @@ msgstr ""
 "Evolution leidis Elm'i s�numifailid.\n"
 "Kas sa soovid neid Evolution'i importida?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11336,12 +11697,12 @@ msgstr ""
 "Evolution leidis GnomeCardi faile.\n"
 "Kas sa soovid neid Evolutionisse importida?"
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "T�htsus: %s"
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11356,7 +11717,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11364,7 +11725,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11373,39 +11734,41 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution impordib sinu Netscape andmeid"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
-#: shell/e-local-storage.c:183
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Pr�gi"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Kohaliku posti fail %s"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr "Kontrollin kausta"
 
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Impordi alustamine"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "S�tted"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Muuda filtreid"
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11413,11 +11776,11 @@ msgstr ""
 "Evolution leidis Netscape postifaile.\n"
 "Kas sa soovid neid Evolutionisse importida?"
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution impordib sinu Pine andmeid"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -11425,414 +11788,409 @@ msgstr ""
 "Evolution leidis Pine postifaile.\n"
 "Kas sa soovid neid Evolutionisse importida?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 #, fuzzy
 msgid "Configure the fonts used by Evolution here"
 msgstr "Evolution'i kalendrihaldamise komponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
 msgid "Configure your email accounts here"
 msgstr "Loob v�i muudab mailikontosid ja muid s�tteid"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution'i kontoredaktor"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Evolution mail composer."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
 msgstr "Evolution'i s�numiredaktor."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution'i s�numiredaktor."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Evolution'i s�numikausta kuvamise komponent."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution'i s�numiredaktor."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "E-posti seadistamisliides"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution'i s�numikausta kuvamise komponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "E-posti seadistamisliides"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution'i s�numikausta kuvamise komponent."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
 msgid "Font Preferences"
 msgstr "E_i kordu"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Kontod"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr "E-posti seadistamisliides"
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "Avalik"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "�lesandeid sisaldav kaust"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "See kaust ei saa sisaldada s�numeid."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Omadused..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Muudab selle kataloogi omadusi"
 
-#: mail/component-factory.c:805
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:970
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:998
-#, fuzzy
-msgid "Warning: Unsent Messages"
-msgstr "Hoiatus: salvestamata s�num"
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Uus s�num"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_Saada s�num"
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "S�numi koostamine"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Uus s�num"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "Eelmisele s�numile"
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Uus s�num"
 
-#: mail/component-factory.c:1078
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Bonobo komponentide s�steemi l�htestamine nurjus"
-
-#: mail/component-factory.c:1087
-msgid "Cannot initialize Evolution's mail config component."
-msgstr ""
-
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's folder info component."
-msgstr ""
-
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
 #, fuzzy
 msgid "Connecting..."
 msgstr "�hendun serverisse..."
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" omadused"
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Omadused"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ajutise kataloogi loomine nurjus: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "uued: %d"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr "peidetud: %d"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr "valitud: %d"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "saatmata: %d"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "saadetud: %d"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "kokku: %d"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Loo s�numi baasil _Virtuaalne Kaust"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "VKaust _teema j�rgi"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "VKaust _saatja j�rgi"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "VKaust _adressaatide j�rgi"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema j�rgi"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja j�rgi"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide j�rgi"
 
-#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi j�rgi"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut s�numit..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_Tr�ki"
 
-#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Vasta k�igile"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Saada edasi"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1771
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "L�petatud"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Puhasta"
 
 #. separator here?
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_M�rgi loetuks"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "M�rgi kui l_ugemata"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "M�rgi t�_htsaks"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "M�rgi v�het_�htsaks"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Taasta"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_T�sta kausta..."
 
-#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Ko_peeri kausta..."
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lisa saatja aadressiraamatusse"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Rakenda filtrid"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Loo s�numi baasil _reegel"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter  p_ostiloendi j�rgi"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default"
 msgstr "_Vaikimisi"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution'i s�numiredaktor."
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution'i s�numiredaktor."
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution'i s�numiredaktor."
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Impordib Outlook Express 4 faile Evolution'i"
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolution'i s�numiredaktor."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -11866,100 +12224,100 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:159
+#: mail/mail-account-editor.c:146
 msgid "Evolution Account Editor"
 msgstr "Evolution'i kontoredaktor"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_Konto nimi:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_Kataloog:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua �he nimega kahte kontot."
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Oled sa kindel, et soovid seda kontot kustutada?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "�ra kustuta"
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "Kas t�esti kustutame konto?"
-
-#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr "Keela"
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr "Luba"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
+#, fuzzy
+msgid "[Default]"
+msgstr "_Vaikimisi"
+
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Konto nimi:"
 
-#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "S�numi saaja: %s"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Teema on %s"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "S�numi saatja: %s"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "postiloend %s"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-autofilter.c:376
+#: mail/mail-autofilter.c:372
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11967,7 +12325,12 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:154
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Seda teadet enam mitte n�idata."
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11975,30 +12338,36 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:211
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:254
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Saata sellegipoolest?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12006,102 +12375,106 @@ msgstr ""
 "Sellel s�numil on teema v�li t�hi.\n"
 "Kas saadame ilma teemata?"
 
-#: mail/mail-callbacks.c:356
+#: mail/mail-callbacks.c:313
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:364
+#: mail/mail-callbacks.c:322
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:777
+#: mail/mail-callbacks.c:722
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%%s kirjutas %a, %d.%m.%Y kell %H:%M:"
 
-#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "T�sta s�num(id) kausta..."
 
-#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Kopeeri s�num(id) kausta..."
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "�htegi s�numit ei ole valitud"
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "Kirjutada fail �le?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Ei saa k�tte s�numit: %s\n"
+"  %s"
 
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s on juba olemas\n"
+"Kas soovid �le kirjutada?"
+
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "S�numi salvestamine teise nimega..."
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "S�numite salvestamine teise nimega..."
 
-#: mail/mail-callbacks.c:2655
+#: mail/mail-callbacks.c:2687
 #, fuzzy
-msgid "Go to next folder with unread messages?"
-msgstr "Kuvab j�rgmise lugemata s�numi"
-
-#: mail/mail-callbacks.c:2662
 msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2905
-msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12110,7 +12483,7 @@ msgstr ""
 "\n"
 "Kas t�esti eemaldame kustutatud s�numid?"
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12119,64 +12492,64 @@ msgstr ""
 "Viga filtriinfo laadimisel:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtrid"
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "T�mban %d. s�numit %dst"
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "S�numi tr�kkimine"
 
-#: mail/mail-callbacks.c:3156
-msgid "US-Letter"
-msgstr "US-Letter"
-
-#: mail/mail-callbacks.c:3197
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "S�numi tr�kkimine nurjus"
 
-#: mail/mail-callbacks.c:3387
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:223
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+#, fuzzy
+msgid "Unnamed"
+msgstr "Nimetu kontakt"
 
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
+#: mail/mail-composer-prefs.c:335
 #, fuzzy
-msgid " [script]"
-msgstr "Kirjeldus puudub"
+msgid "You must specify a valid script name."
+msgstr "Stiili nimi:"
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
-msgstr ""
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+#, fuzzy
+msgid "[script]"
+msgstr "Kirjeldus puudub"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
+#: mail/mail-composer-prefs.c:864
 #, fuzzy
-msgid "Unnamed"
-msgstr "Nimetu kontakt"
+msgid "Language(s)"
+msgstr "Keel"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
 #, fuzzy
 msgid "Add script signature"
 msgstr "Lisa tingimus"
 
-#: mail/mail-composer-prefs.c:876
+#: mail/mail-composer-prefs.c:926
 #, fuzzy
-msgid "Add Signature"
-msgstr "Allkirja salvestamine"
+msgid "Signature(s)"
+msgstr "_HTML allkiri:"
+
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Identiteet"
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:382
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -12188,7 +12561,12 @@ msgstr ""
 "v�ib t�ita siis, kui sa soovid nendes v�ljades olevat infot kaasata oma "
 "s�numitesse."
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "Posti vastuv�tmine"
+
+#: mail/mail-config-druid.c:390
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -12199,11 +12577,16 @@ msgstr ""
 "meetrites kindel, k�si oma lisainfot oma s�steemiadministraatorilt v�i "
 "interneti teenusepakkujalt"
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Posti saatmine"
+
+#: mail/mail-config-druid.c:402
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -12214,7 +12597,11 @@ msgstr ""
 "parameetrites kindel, k�si oma lisainfot oma s�steemiadministraatorilt v�i "
 "interneti teenusepakkujalt"
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Kontohaldus"
+
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12223,154 +12610,137 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:637
-msgid "Evolution Account Assistant"
-msgstr "Evolution'i kontoassistent"
-
-#: mail/mail-config.c:622
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "Konto"
-
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: mail/mail-config.c:2394 mail/mail-config.c:2398
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "�hendun serverisse..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Tuvasta toetatavad t��bid"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr ""
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Account Editor"
 msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Konto kohta k�iv info:"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Kontohaldus"
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Lisa tingimus"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Allkirja salvestamine"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "V�ljuvad _s�numid allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "Lisa s�numile manus"
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentimine"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Kontrolli uusi s�numeid automaatselt"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Tundmatu m�rgistik: %s"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "C_olors"
 msgstr "_Sulge"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Uute s�numite kontroll"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "T�na l�ppevate �lesannete v�rvus"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "S�numi koostamine"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "H��lestus"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
+#, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
 "�nnitlen, sinu e-posti seadistamine on l�ppenud.\n"
 "\n"
@@ -12379,309 +12749,306 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"L�peta\"."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Vaikimisi kodeering: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "E-posti v�tmine"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr "Diditaalsed ID'd..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "S�numi avamine eba�nnestus"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Mustandite kaust:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Luba"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Emacs"
 msgstr "Idast"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "E-posti aadress sisaldab"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "E-posti aadress:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Programmist v�ljumisel _puhasta pr�gikaust"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Evolution'i kontoassistent"
+
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "K�ivita tegevused"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "l�ppeb"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Font Properties"
 msgstr "Omadused"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Edasi saadetud s�numid"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "Hangi Digitaalne ID..."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_R�huta tsitaate"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Identiteet"
-
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "S�numi sees"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Salvesta ja sulge"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "_Lae pildid"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "E-posti seadistamine"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Kirja p�is"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "S�numi _kuvamine"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "S�num sisaldab"
+
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikroneesia"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "E-posti seadistamine"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "On Screen fonts"
-msgstr ""
-
 # !PARANDA! - siia peaks leidma s�na, mis ei oleks eitav
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Mittekohustuslik info"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "T_��koht:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _V�tme ID:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Vali v�rvus"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "T�psustus, kui p��takse saata s�numit, millel on kirjeldatud ainult "
 "pimekoopia adressaadid"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Tr�kib valitud kontaktid"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quote original message"
 msgstr "S�numi avamine eba�nnestus"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "_J�ta see parool meelde"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Vastus:"
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "E-posti vastuv�tmine"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Vastuv�tmise valikud"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Remember this _password"
 msgstr "J�ta see parool meelde"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Kohustuslik info"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Vaikimisi"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Turvalisus"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "E-posti saatmine"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Saadetud _s�numite kaust:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Saadetud s�numid ja mustandid"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Serveri seadistused"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "Serveri _t��p: "
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Kiirvalikud"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stiili nimi:"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr ""
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
@@ -12716,10 +13083,11 @@ msgid "V_ariable-width:"
 msgstr "Muutlik"
 
 #: mail/mail-config.glade.h:129
+#, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 "Tere tulemast kasutama Evolution'i kontoassitenti.\n"
 "\n"
@@ -12794,119 +13162,124 @@ msgid "_Enable"
 msgstr "Luba"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Saada edasi m��ratud kujul"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Full name:"
 msgstr "_T�isnimi"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML s�numis"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteet"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_Lae pildid ainult, kui saatja on aadressiraamatus"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "See konto on minu _vaikimisi konto"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_M�rgi s�num loetuks peale"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_�ra lae �htegi pilti v�rgust"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "T�psustus, kui p��takse saata HTML s�numit isikule, kes seda ei soovi"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "T�psustus, kui p��takse saata s�numit ilma teemata"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Posti vastuv�tmine"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Vasta k�igile"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Script:"
 msgstr "_Turvalisus"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Posti saatmine"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "N�ita aega kui"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML allkiri:"
 
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Sand Point"
+
 #: mail/mail-config.glade.h:175
 #, fuzzy
-msgid "_Use secure connection (SSL):"
-msgstr "Kasuta turvalist �hendust (_SSL)"
+msgid "_Terminal Font:"
+msgstr "Esialgne kontakt:"
 
 #: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Variable-width:"
-msgstr "Muutlik"
+msgid "_Use secure connection (SSL):"
+msgstr "Kasuta turvalist �hendust (_SSL)"
 
 #: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "_intervalliga:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "color"
 msgstr " v�rvusega"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "kirjeldus"
 
@@ -12930,200 +13303,202 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Antud nimega fail eksisteerib.\n"
+"Kirjutada �le?"
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Salvesta kaasatud fail"
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Ajutise kataloogi loomine nurjus: %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Salvesta kaasatud fail"
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Kuva s�numi sees"
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Kuva s�numi sees (%s abil)"
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "�ra kuva"
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
 #, fuzzy
 msgid "Downloading images"
 msgstr "_Lae pildid"
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Hilinenud �lesanded:"
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d. %b %l:%M %p"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Kopeeri viida asukoht"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Salvesta pilt kui..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Kontrollin %s"
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "\"%s\" t��pi manus"
 
-#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
-#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:783 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Kuup�ev"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:913 mail/message-list.etspec.h:7
-#: mail/message-tags.glade.h:3
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Kellelt"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:922 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kellele"
 
-#: mail/mail-format.c:927
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Koopia"
 
-#: mail/mail-format.c:932
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Pimekoopia"
 
-#: mail/mail-format.c:963
-#, fuzzy
-msgid "Mailer"
-msgstr ""
-"\n"
-"Postiprogramm:"
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "See s�num on digitaalselt allkirjastatud. Lisainfo jaoks kliki lukuikoonil."
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "�henduse loomine POP serveriga nurjus: %s"
 
 # !PARANDA! - kas on ikka t�pne t�lge?
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "See s�num on digitaalselt allkirjastatud ja autentne."
 
 # !PARANDA! - kas on ikka t�pne t�lge?
-#: mail/mail-format.c:1892
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "See s�num on digitaalselt allkirjastatud kuid ei ole autentne."
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Kohalikud kaustad"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:748
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr "Ei saa salvestada kausta metainfot faili %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ei saa salvestada kausta metainfot faili %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kausta %s metaandmete kustutamine nurjus: %s"
@@ -13133,18 +13508,18 @@ msgstr "Kausta %s metaandmete kustutamine nurjus: %s"
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Muudan kausta \"%s\" vormingusse \"%s\""
 
-#: mail/mail-local.c:1351
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
@@ -13166,108 +13541,108 @@ msgstr ""
 "Operatsiooni k�igus tekkis viga:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "T��tan"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtreerin kausta"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "E-posti v�tmine"
 
-#: mail/mail-ops.c:553 mail/mail-ops.c:582
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
 msgstr "Sellegipoolest saadeti s�num edukalt."
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Saadan \"%s\""
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Saadan s�numit %d (kokku: %d)"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Salvestan s�numi kausta"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "T�stan s�numid %s"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Kontrollin kaustu \"%s\""
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Edasi saadetud s�numid"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avan kausta %s"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eemaldan kausta %s"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "S�ilitan Kausta '%s'"
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "V�rskendan kausta"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "T�hjendan kausta"
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "V�tan vastu s�numit %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "V�tan vastu %d teadet"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvestan %d s�numit"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13276,72 +13651,72 @@ msgstr ""
 "V�ljundfaili loomine nurjus: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "�hendun lahti: %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taastan �henduse: %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_Otsi"
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Pealkirjata s�num)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Pealkirjata s�num"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "T�hi s�num"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Otsi s�numist"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "Otsi"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "T�stutundlik"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Leia:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Vastavusi:"
 
@@ -13349,68 +13724,64 @@ msgstr "Vastavusi:"
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, t��p: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kataloog: %s, t��p: %s"
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr "T��p: %s"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr "S�numite saatmine ja vastuv�tmine"
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "Katkesta k�ik"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "Uuendan..."
 
-#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
 msgid "Waiting..."
 msgstr "Ootan..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas t��."
 
-#: mail/mail-session.c:272
-msgid "_Remember this password"
-msgstr "_J�ta see parool meelde"
-
-#: mail/mail-session.c:273
-msgid "_Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-session.c:330
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Palun sisesta %s parool"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:280
+msgid "_Remember this password"
+msgstr "_J�ta see parool meelde"
+
+#: mail/mail-session.c:281
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-signature-editor.c:80
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Ei saa salvestada allkirjafaili."
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "Allkirja salvestamine"
-
-#: mail/mail-signature-editor.c:181
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13420,44 +13791,52 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
-#: mail/mail-signature-editor.c:333
+#: mail/mail-signature-editor.c:229
+msgid "_Discard changes"
+msgstr ""
+
+#: mail/mail-signature-editor.c:233
+msgid "Save signature"
+msgstr "Allkirja salvestamine"
+
+#: mail/mail-signature-editor.c:389
 #, fuzzy
 msgid "Edit signature"
 msgstr "Lisa tingimus"
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:429
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML allkiri:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Nimi:"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Edasi saadetud s�num - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Edasi saadetud s�num"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Edasi saadetud s�num"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13466,97 +13845,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VKaustad"
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "vKaustad"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Muuda VKausta"
 
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Proovitake redigeerida olematut vkausta '%s'."
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Uus VKaust"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Teema puudub)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - s�num"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "N�gemata"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "N�htud"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Vastatud"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "Mitu n�gemata s�numit"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "Mitu s�numit"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "Madal"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "K�rge"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "K�rgeim"
 
-#: mail/message-list.c:1066
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "T�na %l:%M %p"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a, %l:%M %p"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %l:%M %p"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:2568
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "S�numite nimekirja koostamine"
 
@@ -13591,47 +13970,47 @@ msgstr "Vastu v�etud"
 msgid "Size"
 msgstr "Suurus"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Liigub edasi"
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:64
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:65
 #, fuzzy
 msgid "For Your Information"
 msgstr "Allika info"
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Saada edasi"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Vasta"
 
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Vasta k�igile"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 #, fuzzy
 msgid "Review"
 msgstr "Eelvaade"
 
-#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13661,53 +14040,44 @@ msgstr "T�htaeg "
 msgid "_Flag:"
 msgstr "Faili nimi:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Kontrollin %s all olevaid kaustu serveris \"%s\""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Kontrollin juurtaseme kaustu servers \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Kausta \"%s\" tellimine"
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Kausta \"%s\" tellimuse l�petamine"
 
-#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Kaust"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Salvesta kausta..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "�htegi serverit ei ole valitud"
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Palun vali server."
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "All folders"
-msgstr "K�ik kaustad"
-
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "Aprill"
-
 #: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -13718,63 +14088,47 @@ msgid "Close"
 msgstr "Sulge"
 
 #: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Display Options"
-msgstr "N�ita h��lestusi"
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr "Kaustad, mille nimi algab stringiga:"
-
-#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr "Tellimuste haldamine"
 
-#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "V�rskenda nimekirja"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Vali kaust"
 
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "Vali fail"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Telli"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "_L�peta tellimus"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Configuration control for the Evolution Summary."
-msgstr ""
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Evolution'i kalendrihaldamise komponent."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Summary component."
+msgid "Evolution Summary"
 msgstr "Evolution'i s�numiredaktor."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
-msgid "Factory for Evolution Summary's configuration control."
-msgstr ""
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Summary component"
+msgstr "Evolution'i s�numiredaktor."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
-msgid "Factory for the Evolution Summary component."
-msgstr ""
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Evolution'i s�numiredaktor."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 #, fuzzy
 msgid "Summary Preferences"
 msgstr "Kokkuv�tte s�tted"
@@ -17177,7 +17531,7 @@ msgid "Hagerstown"
 msgstr "Hagerstown"
 
 #. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
 msgid "Hail"
 msgstr "Rahe"
 
@@ -18871,6004 +19225,5995 @@ msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
 #: my-evolution/Locations.h:1325
-msgid "Marquette"
-msgstr "Marquette"
-
-#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Lennujaam"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Lennujaam"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Lennujaam"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Middle East"
 msgstr "L�his-Ida"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr "Mineraln�je Vod�"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
 msgstr "Miyakejima Lennujaam"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Lennujaam"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regionaalne Lennujaam"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Lennujaam"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr "M�nchengladbach"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
 msgstr "Moskva Domodedovo"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
 msgstr "Moskva �eremetjevo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr "M�nchen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Lennujaam"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
 msgstr "Nagoya Lennujaam"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
 msgstr "Naha Lennujaam"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Lennujaam"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama Lennujaam"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Naples"
 msgstr "Naples"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
 msgstr "Tokyo Uus Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr "New York JFK Lennujaam"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
 msgstr "Niigata Lennujaam"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr "Ni�ni Novgorod"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norrkoping"
 msgstr "Norrk�ping"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr "P�hja-Carolina"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Dakota"
 msgstr "P�hja-Dakota"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr "Kirde-Philadelphia"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr "N�rnberg"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
 msgstr "Obihiro Lennujaam"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odesa"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
 msgstr "Oita Lennujaam"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Ojika Island"
 msgstr "Ojika saar"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
 msgstr "Okayama Lennujaam"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
 msgstr "Oki Lennujaam"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Okushiri Island"
 msgstr "Okushiri saar"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando Rahvusvaheline)"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr "Osaka Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
 msgstr "Oshima Lennujaam"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr "Pariis/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr "Pariis/Le Bourget"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Orly"
 msgstr "Pariis/Orly"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
 msgstr "Hiina Rahvavabariik"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamt�atski"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Lennujaam"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr "Pihkva"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr "Pj�ngjang"
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr "Radu�n�i"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
 msgid "Rishiri Island"
 msgstr "Rishiri saar"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
 #, fuzzy
 msgid "Rivne"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 msgid "Roma/Ciampino"
 msgstr "Rooma/Ciampino"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr "Rooma/Fiumicino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr "Rooma/Urbe"
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr "Rostov Doni ��res"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 msgid "Russia"
 msgstr "Venemaa"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr "Saarbr�cken"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Munitsipaallennujaam"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
 msgid "Samara"
 msgstr "Samaara"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 msgid "San Nicholas Island"
 msgstr "San Nicholase saar"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr "Saraatov"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
 msgid "Sendai Airport"
 msgstr "Sendai Lennujaam"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 msgid "Sochi"
 msgstr "Sot�i"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 msgid "South Carolina"
 msgstr "L�una-Carolina"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr "L�una-Dakota"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 msgid "South Marsh Island"
 msgstr "South Marshi saar"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 msgid "St Simon's Island"
 msgstr "St Simoni saar"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr "S�kt�vkar"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
 #, fuzzy
 msgid "Sympheropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Lennujaam"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
 #, fuzzy
 msgid "Tallinn"
 msgstr "Tallinn"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr "Tanegashima Lennujaam"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr "Teheran-Mehrabad"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima saar"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr "Tokyo Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr "Tokyo Uus Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 msgid "Tottori Airport"
 msgstr "Tottori Lennujaam"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
 msgstr "Toyama Lennujaam"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr "Troms�/Langnes"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
 msgstr "Tsushima Lennujaam"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
 msgid "Tyumen"
 msgstr "Tjumen"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr "Ufaa"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr "Uljanovsk"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr "Ume�"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
 msgid "United Arab Emirates "
 msgstr "Araabia �hendemiraadid"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
 #, fuzzy
 msgid "Uzhgorod"
 msgstr "Euroopa/Uzhgorod"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 msgid "Vasteras"
 msgstr "V�ster�s"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr "Vaxj�"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
 msgid "Venezia"
 msgstr "Veneetsia"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tehn. Lennujaam"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr "Vorone�"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasseri Lennujaam"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Lennujaam"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
 msgid "Wallops Island"
 msgstr "Wallopsi saar"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr "Varssavi"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 msgid "Watertown"
 msgstr ""
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr "L��ne-Atlanta"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr "L��ne-Virginia"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 msgid "Wien"
 msgstr "Viin"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
 msgstr "Willow Lennujaam"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatoorium"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr "Jakutsk"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
 msgstr "Yamagata Lennujaam"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube Lennujaam"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
 msgid "Yao Airport"
 msgstr "Yao Lennujaam"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr "Jekaterinburg"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Ju�no-Sahhalinsk"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr "Zama Lennuv�li"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
 msgid "Zurich"
 msgstr "Z�rich"
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "S�ndmused"
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "S�ndmused puuduvad"
 
-#: my-evolution/e-summary-calendar.c:418
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d. %B"
 
-#: my-evolution/e-summary-calendar.c:420
-msgid "%l:%M %d %B"
+#: my-evolution/e-summary-calendar.c:407
+#, fuzzy
+msgid "%l:%M%P %d %B"
 msgstr "%l:%M %d. %B"
 
-#: my-evolution/e-summary-calendar.c:438
+#: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr "Kirjeldus puudub"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "S�numite kokkuv�te"
 
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1102
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#. translators: Put a list of codes for locations you want to see in
-#. My Evolution by default here. You can find the list of all
-#. stations and their codes in Evolution sources.
-#. (evolution/my-evolution/Locations)
-#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:591
-msgid "KBOS"
-msgstr "EETN"
-
-#: my-evolution/e-summary-preferences.c:584
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr "P�eva lause"
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Lisa uudistekanal"
 
-#: my-evolution/e-summary-preferences.c:848
+#: my-evolution/e-summary-preferences.c:621
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Sisesta lisatava uudistekanali URL"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "Viga RDF'i allalaadimisel"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 #, fuzzy
 msgid "Add"
 msgstr "_Lisa"
 
-#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Vihmavalingud"
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "�lesanded puuduvad"
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(Kirjeldus puudub)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr "Ilmateade"
 
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Ilm"
 
-#: my-evolution/e-summary.c:188
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:584
+msgid "KBOS"
+msgstr "EETN"
+
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%A, %e. %B %Y"
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "Palun oota..."
 
-#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Kokkuv�tte tr�kkimine"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Kokkuv�tte tr�kkimine eba�nnestus"
 
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "Bonobo laadimine eba�nnestus.\n"
-
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " F"
 msgstr "� F"
 
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " C"
 msgstr "� C"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "knots"
 msgstr "s�lme"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr "k/h"
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "inHg"
 msgstr "tolli/Hg"
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "mmHg"
 msgstr "mmHg"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "miles"
 msgstr "miili"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr "kilomeetrit"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "Selge taevas"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr "Pilver�balad"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "Vahelduv pilvisus"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "V�hene pilvisus"
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr "Lauspilves"
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
 msgid "Invalid"
 msgstr "Vigane"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "Muutlik"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "P�hjast"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "P�hjast - kirdest"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "Kirdest"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "Idast - kirdest"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "Idast"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "Idast - kagust"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "Kagust"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "L�unast - kagust"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "L�unast"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "L�unast - edelast"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "Edelast"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "L��nest - edelast"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "L��nest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "L��nest - loodest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "Loodest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "P�hjast - loodest"
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr "Uduvihm"
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr "Uduvihm l�heduses"
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr "N�rk uduvihm"
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr "M��dukas uduvihm"
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr "Tugev uduvihm"
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr "Madal uduvihm"
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr "Paiguti sajab uduvihma"
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr "Aeg-ajalt sajab uduvihma"
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "�ike"
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr "Uduvihm tuulega"
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr "Vihmavalingud"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr "Liikuv uduvihm"
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr "J��tuv uduvihm"
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "Vihm"
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr "L�heduses sajab"
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr "Kerge vihm"
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr "M��dukas vihm"
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr "Tugev vihm"
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr "Madal vihm"
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr "Paiguti sajab vihma"
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr "Hoovihmad"
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr "Vihm tuulega"
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr "Vihmavalingud"
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr "Liikuv vihm"
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr "J��tuv vihm"
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "Lumi"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr "L�heduses sajab lund"
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr "N�rk lumesadu"
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr "M��dukas lumesadu"
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr "Tugev lumesadu"
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr "Madal lumesadu"
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr "Paiguti sajab lund"
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr "Hooti sajab lund"
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Lumetorm"
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr "Lumesadu tuulega"
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr "Hootised lumesajud"
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr "Liikuv lumesadu"
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr "J��tuv lumesadu"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr "Lumeterad"
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr "L�heduses sajab lumeteri"
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr "N�rgalt lumeteri"
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr "M��dukalt lumeteri"
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr "Tihedalt lumeteri"
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr "Madalal sajab lumeteri"
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr "Paiguti sajab lumeteri"
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr "Hooti sajab lumeteri"
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr "Lumeterad tuulega"
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr "Lumeterade valingud"
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr "Liikuvad lumeterad"
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr "J��tuvad lumeterad"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr "J��kristallid"
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr "J��kristallid l�heduses"
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr "V�he j��kristalle"
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr "M��dukalt j��kristalle"
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr "Tihedalt j��kristalle"
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr "Paiguti on j��kristalle"
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr "Hooti sajab j��kristalle"
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr "J��kristallide torm"
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr "J��kristallid tuulega"
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr "J��kristallide valingud"
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr "Liikuvad j�kristallid"
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr "J��tuvad j��kristallid"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr "J��terad"
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr "J��terad l�heduses"
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr "V�he j��teri"
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr "M��dukalt j��teri"
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr "Tihedalt j��teri"
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr "Madalad j��terad"
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr "Paiguti j��teri"
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr "Hooti j��teri"
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr "J��terade torm"
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr "J��terad tuulega"
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr "J��terade valingud"
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr "Liikuvad j��terad"
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr "J��tuvad j��terad"
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr "Rahe l�heduses"
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "N�rk rahesadu"
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr "M��dukas rahesadu"
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr "Tugev rahesadu"
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr "Madal rahesadu"
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr "Paiguti on rahesadu"
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr "Hooti on rahesadu"
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr "Rahetorm"
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr "Rahesadu tuulega"
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr "Rahehood"
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr "Liikuv rahesadu"
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr "J��tuv rahesadu"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr "Peen rahe"
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr "Peen rahe l�heduses"
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr "M��dukalt peent rahet"
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr "Tugevalt peent rahet"
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr "Madal peen rahe"
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr "Paiguti on peent rahet"
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr "Hooti on peent rahet"
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr "Peene rahe tuisk"
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr "Peen rahe tuulega"
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr "Peene rahe hood"
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr "Liikuv peene rahe sadu"
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr "J��tuv peene rahe sadu"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr "Teadmata sademed"
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr "Sademed l�heduses"
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr "N�rgad sademed"
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr "M��dukad sademed"
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr "Tugevad sademed"
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr "Madalad sademed"
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr "Paiguti sademeid"
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr "Hooti sademeid"
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr "Teadmata �ike"
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr "Sademed tuulega"
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr "Teadmata sademete hood"
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr "Liikuvad sademed"
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr "J��tuvad sademed"
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr "Hajus udu"
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr "L�heduses on hajus udu"
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr "Kerge uduvine"
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr "Keskmise hajusat udu"
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr "Tihedalt hajusat udu"
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr "Madal hajus udu"
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr "Paiguti hajusat udu"
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr "Hooti hajusat udu"
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr "Hajus udu tuulega"
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr "Liikuv hajus udu"
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr "J��tuv hajus udu"
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr "Udu"
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr "Udu l�heduses"
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr "N�rk udu"
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr "M��dukas udu"
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr "Paks udu"
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr "Madal udu"
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr "Paiguti udu"
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr "Hooti udu"
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr "Udu tuulega"
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr "Liikuv udu"
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr "J��tuv udu"
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr "Suits"
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr "Suits l�heduses"
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr "V�hene suits"
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr "M��dukas suits"
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr "Paks suits"
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr "Madal suits"
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr "Paiguti suitsu"
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr "Hooti suitsu"
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr "Tormiline suits"
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr "Suits tuulega"
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr "Liikuv suits"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr "Vulkaaniline tuhk"
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr "Vulkaaniline tuhk l�heduses"
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr "M��dukalt vulkaanilist tuhka"
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr "Tihedalt vulkaanilist tuhke"
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr "Madal vulkaaniline tuhk"
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr "Paiguti vulkaanilist tuhka"
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr "Hooti vulkaanilist tuhka"
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
 msgstr "Tormiliselt vulkaanilist tuhke"
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr "Vulkaaniline tuhk tuulega"
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 msgid "Showers of volcanic ash"
 msgstr "Vulkaanilise tuha valangud"
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr "Liikuv vulkaaniline tuhk"
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr "J��tuv vulkaaniline tuhk"
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr "Liiv"
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr "Liiv l�heduses"
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr "Pisut liiva"
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr "M��dukalt liiva"
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr "Tihedalt liiva"
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr "Paiguti liiva"
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr "Hooti liiva"
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr "Liiv tuulega"
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr "Liikuv liiv"
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr "Vine"
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr "Vine l�heduses"
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr "Kerge vine"
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr "M��dukas vine"
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr "Paks vine"
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr "Madal vine"
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr "Paiguti vine"
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr "Hooti vine"
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr "Vine tuulega"
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr "Liikuv vine"
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr "J��tuv vine"
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 msgid "Spray"
 msgstr "Veetolm"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 msgid "Spray in the vicinity"
 msgstr "Veetolm l�heduses"
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 msgid "Light spray"
 msgstr "N�rgalt veetolmu"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 msgid "Moderate spray"
 msgstr "M��dukalt veetolmu"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 msgid "Heavy spray"
 msgstr "Tihedalt veetolmu"
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 msgid "Shallow spray"
 msgstr "Madalal veetolmu"
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
 msgstr "Paiguti veetolmu"
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 msgid "Partial spray"
 msgstr "Hooti veetolmu"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
 msgstr "Veetolm tuulega"
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
 msgstr "Liikuv veetolm"
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 msgid "Freezing spray"
 msgstr "J��tuv veetolm"
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr "Tolm"
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr "Tolm l�heduses"
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr "Pisut tolmu"
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr "M��dukalt tolmu"
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr "Paksult tolmu"
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr "Paiguti tolmu"
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr "Hooti tolmu"
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr "Tolm tuulega"
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr "Liikuv tolm"
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr "Tuuleiilid"
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr "Tuuleiilid l�heduses"
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr "N�rgad tuuleiilid"
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr "M��dukad tuuleiilid"
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr "Tugevad tuuleiilid"
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr "Hooti tuuleiilid"
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr "Tormipuhangud"
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr "Puhanguline tuul"
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr "Liikuvad tuuleiilid"
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr "J��tuvad tuuleiilid"
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr "Liivatorm"
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr "Liivatorm l�heduses"
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr "N�rk liivatorm"
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr "M��dukas liivatorm"
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr "Tugev liivatorm"
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr "Madal liivatorm"
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr "Hooti liivatorm"
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr "Metsik liivatorm"
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr "Tugev liivatorm"
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr "Liikuv liivatorm"
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr "J��tuv liivatorm"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr "Tolmutorm"
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr "Tolmutorm l�heduses"
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr "N�rk tolmutorm"
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr "M��dukas tolmutorm"
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr "Tugev tolmutorm"
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr "Madal tolmutorm"
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr "Hooti tolmutorm"
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr "Metsik tolmutorm"
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr "Tugev tolmutorm"
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr "Liikuv tolmutorm"
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr "J��tuv tolmutorm"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr "Tuulispask"
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr "Tuulispask l�heduses"
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr "N�rk tuulispask"
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr "M��dukas tuulispask"
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr "Tugev tuulispask"
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr "Madal tuulispask"
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr "Paiguti tuulispasad"
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr "Hooti tuulispasad"
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr "Tuulispask ja tugev tuul"
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr "Liikuv tuulispask"
 
 #. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
+#: my-evolution/metar.c:443 my-evolution/metar.c:452
 msgid "Tornado"
 msgstr "Tornaado"
 
-#: my-evolution/metar.c:443
+#: my-evolution/metar.c:444
 msgid "Tornado in the vicinity"
 msgstr "Tornaado l�heduses"
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr "M��dukas tornaado"
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr "Raevukas tornaado"
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr "Hooti tornadadod"
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr "Metsik tornaado"
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr "Liikuv tornaado"
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr "J��tuv tornaado"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr "Tolmup��rised"
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr "Tolmup��rised l�heduses"
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr "N�rgad tolmup��rised"
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr "M��dukad tolmup��rised"
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr "Tugevad tolmup��rised"
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr "Madalad tolmup��rised"
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr "Paiguti tolmup��rised"
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr "Hooti tolmup��rised"
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr "Tolmup��rised tuulega"
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr "Liikuvad tolmup��rised"
 
@@ -24966,34 +25311,34 @@ msgstr "_Ajakava"
 msgid "_Weather"
 msgstr "_Ilmateade"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+# !PARANDA!
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 #, fuzzy
-msgid "Configuration control for Evolution folder settings."
-msgstr "Evolution'i kalendrihaldamise komponent."
+msgid "Evolution Shell"
+msgstr "Evolution'i shell"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
-msgid "Configure special folders and offline folder behavior here"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 #, fuzzy
 msgid "Folder Settings"
 msgstr "S�numite s�tted"
 
-# !PARANDA!
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "Evolution'i shell"
-
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "N�ita detaile"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "Katkesta tegevus"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25002,52 +25347,38 @@ msgstr ""
 "Kausta �mbernimetamine eba�nnestus:\n"
 "%s"
 
-#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, fuzzy, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "Ava programmiga %s..."
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 #, fuzzy
 msgid "Add a Folder"
 msgstr "Vali kaust"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
-#: shell/e-shortcuts.c:1055
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Sisendkast"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "V�ljundkast"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 msgid "Sent"
 msgstr "Saadetud"
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "Evolutioni installimine"
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -25058,41 +25389,14 @@ msgstr ""
 "%s\n"
 "Viga: %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:282
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution ei suutnud luua kataloogi\n"
-"%s:\n"
-"%s"
-
-#: shell/e-setup.c:300
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:306
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:329
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25100,16 +25404,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:343
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25121,27 +25416,27 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
 msgstr "L�petamise kuup�ev"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "Erikaustad"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
 msgstr "Erikaustad"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "Erikaustad"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 #, fuzzy
 msgid "Autocompletion Folders"
 msgstr "L�petamise kuup�ev"
@@ -25151,44 +25446,44 @@ msgstr "L�petamise kuup�ev"
 msgid "Cannot copy folder: %s"
 msgstr "Ei saa kontrollida kausta: %s: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, fuzzy, c-format
 msgid "Cannot move folder: %s"
 msgstr ""
 "Kausta �mbernimetamine eba�nnestus:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:204
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:321
+#: shell/e-shell-folder-commands.c:319
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "M��ra kaust, mille alla tuleb kaust \"%s\" kopeerida:"
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Kausta kopeerimine"
 
-#: shell/e-shell-folder-commands.c:365
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "M��ra kaust, mille alla tuleb kaust \"%s\" t�sta:"
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Kausta �mbert�stmine"
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25197,19 +25492,19 @@ msgstr ""
 "Kausta kustutamine nurjus:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Kustuta \"%s\""
-
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr ""
 "Kausta kustutamine nurjus:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Kustuta \"%s\""
+
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25218,26 +25513,26 @@ msgstr ""
 "Kausta �mbernimetamine eba�nnestus:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Kausta nime muutmine"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:165
+#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-creation-dialog.c:170
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Kirjeldatud kaustanimi ei ole korrektne: %s"
 
-#: shell/e-shell-folder-commands.c:586
+#: shell/e-shell-folder-commands.c:583
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:586
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25246,7 +25541,7 @@ msgstr ""
 "Kausta �mbernimetamine eba�nnestus:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:122
+#: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25255,24 +25550,20 @@ msgstr ""
 "Kirjeldatud kausta loomine nurjus:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Loo _uus kaust..."
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "Uus..."
-
-#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Pealkirjata)"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr "Vali, millist t��pi importerit sa soovid kasutada:"
 
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -25281,11 +25572,11 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Palun valige informatsioon, mida soovite importida:"
 
-#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25294,22 +25585,22 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi %d."
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "Vali kaust"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "Faili %s ei leitud."
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:552
 msgid "Evolution Error"
 msgstr "Evolution'i viga "
 
-#: shell/e-shell-importer.c:504
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25318,11 +25609,11 @@ msgstr ""
 "Puudub importija, mis suudaks hakkama saada failiga\n"
 "%s"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Importimine"
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25331,17 +25622,17 @@ msgstr ""
 "Impordin %s.\n"
 "K�ivitan %s"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Viga %s k�ivitamisel"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Viga %s laadimisel"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25350,32 +25641,32 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi 1."
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Faili nimi:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Vali fail"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Faili t��p:"
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Impordi teiste programmide andmeid ja s�tted"
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Impordi �ksikut faili"
 
 # !PARANDA!
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25383,32 +25674,32 @@ msgstr ""
 "Palun oota...\n"
 "�ritan tuvastada olemasolevaid programme"
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Vali kaust, kuhu salvestada imporditavad andmed"
 
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Impordi"
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Sulgen �hendused..."
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, fuzzy, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -25417,157 +25708,160 @@ msgstr ""
 "Viga tegevusel '%s':\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 #, fuzzy
 msgid "Syncing Folder"
 msgstr "Kausta s�nkroniseerimine"
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:317
+#: shell/e-shell-offline-sync.c:311
 #, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:345
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:357
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+#, fuzzy
+msgid "Please select a user."
+msgstr "Palun vali server."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Avan kausta %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Avan kausta %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Ava programmiga %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:455
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Kausta �mbernimetamine eba�nnestus: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:513
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
 "Kirjeldatud kausta loomine nurjus:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:159
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr ""
-
-#: shell/e-shell-user-creatable-items-handler.c:579
-#: shell/e-shell-user-creatable-items-handler.c:633
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:636
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr "Uus"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Kausta nimi on kirjeldamata."
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Kausta nimi ei tohi sisaldada Return s�mbolit"
 
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
-msgstr "Kausta nimi ei tohi sisaldada kaldkriipse."
+#: shell/e-shell-utils.c:129
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Kausta nimi ei tohi sisaldada Return s�mbolit"
+
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Kausta nimi ei tohi sisaldada Return s�mbolit"
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' on reserveeritud kaustanimed."
 
-#: shell/e-shell-view-menu.c:94
+#: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vahendid ei paista sellesse s�steemi paigaldatud olevat."
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr "Viga %s k�ivitamisel."
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Ei leidnud Bug Buddy't sinu $PATH'ist."
+#: shell/e-shell-view-menu.c:193
+msgid "Bug buddy is not installed."
+msgstr ""
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolutionist"
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "Ava kaust..."
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr "Vali kaust, mida soovid avada"
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Uue kiirvaliku loomine"
 
-#: shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:618
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vali kaust, millele kiirvalik peab osutama:"
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "�hendu v_�rku"
 
-#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Kausta ei n�idata)"
 
-#: shell/e-shell-view.c:1861
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1863
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(Puudub)"
 
-#: shell/e-shell-view.c:1910
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution on hetkel v�rku �hendatud.  Autonoomsesse olekusse "
 "siirdumiseks vajuta seda nuppu."
 
-#: shell/e-shell-view.c:1917
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
 
-#: shell/e-shell-view.c:1923
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25582,12 +25876,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25598,150 +25892,144 @@ msgstr ""
 "l�petas ootamatult. Et nendele andmetele uuesti ligi p��seda, pead\n"
 "sa Evolution'i sulgema ja seej�rel taask�ivitama."
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Ei leia h��lestusandmebaasi"
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "�ldine viga"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "Loo uus kiirvalikute grupp"
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Grupi nimi:"
 
-#: shell/e-shortcuts-view.c:173
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
+#: shell/e-shortcuts-view.c:179
+#, fuzzy, c-format
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
 msgstr ""
 "Soovite Te t�esti eemaldada kiirvalikute\n"
 "ribalt gruppi `%s'?"
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "�ra eemalda"
-
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Nimeta kiirvalikute grupp �mber"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Nimeta valitud grupp uue nimega:"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "_V�iksed ikoonid"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "N�ita kiirvalikuid v�ikeste ikoonidega"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "_Suured ikoonid"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "N�itab kiirvalikuid suurte ikoonidena"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_Uus grupp"
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Loob uue kiirvalikute grupi"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "_Eemalda see grupp..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Eemaldab kiirvalikute grupi"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "_Nimeta see grupp �mber..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Nimeta see kiirvalikute grupp �mber"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "_Peida kiirvalikute riba"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Peidab kiirvalikute riba"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create _Default Shortcuts"
 msgstr "Uue kiirvaliku loomine"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 #, fuzzy
 msgid "Create Default Shortcuts"
 msgstr "Uue kiirvaliku loomine"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Kiirvalikute �mbernimetamine"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Nimeta valitud kiirvalik uue nimega:"
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Avab kausta, mis on seotud selle kiirvalikuga"
 
-#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Ava _uues aknas"
 
-#: shell/e-shortcuts-view.c:410
+#: shell/e-shortcuts-view.c:417
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Avab kausta, mis on seotud selle kiirvalikuga, uues aknas"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "_Nimeta �mber"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Nimeta see kiirvalik �mber"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "_Eemalda"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eemaldab kiirvalikute ribalt selle korralduse"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Viga kiirvalikute salvestamisel."
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Kiirvalikud"
 
@@ -25750,73 +26038,73 @@ msgstr "Kiirvalikud"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Vigu ei tekkinud"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Selle nimega kaust on juba olemas"
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Kirjeldatud kaustat��p on vigane"
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "I/O viga"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Pole piisavalt ruumi kausta loomiseks"
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "Kaust ei ole t�hi"
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "Antud kausta ei leitud"
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Operatsioon ei ole toetatud"
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "Kirjeldatud kausta ei saa muuta ega eemaldada"
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr "Sa ei saa luua selle nimega kausta"
 
-#: shell/e-storage.c:599
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-task-widget.c:191
+#: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:196
+#: shell/e-task-widget.c:216
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<kausta valimiseks kliki siia>"
 
@@ -25849,84 +26137,81 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA viga"
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Katkestatud"
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Vigane parameeter"
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Omanik puudub"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Ei leitud"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Toetamata t��p"
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Toetamata skeem"
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Toetamata tegevus"
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Sisemine viga"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Olemas"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Vigane URI"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Sisaldab alamkaustu"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Vaba ruum on otsas"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test type"
 msgstr "Faili t��p:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Aktiivsed �hendused"
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Evolution'i s�numiredaktor."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Click OK to close these connections and go offline"
 msgstr "�henduste sulgemiseks ja offline reziimi siirdumiseks vajuta \"Olgu\""
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Host"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr "Hetkel on aktiivsed j�rgnevad �hendused:"
 
@@ -25950,15 +26235,15 @@ msgstr "E-_Post"
 msgid "_Tasks:"
 msgstr "�lesanded"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Kausta nimi:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "Kausta t��p:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
@@ -25982,29 +26267,30 @@ msgstr "Kausta nimi:"
 msgid "_User:"
 msgstr "_Konto nimi:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution'i seadistamise assistent"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Impordin faile"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Ajav��nd "
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Tere tulemast!"
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
+#, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 "Tere tulemast Evolution'i. J�rgnevate vormide abil on\n"
 "sul v�imalik h��lestada Evolution'i e-posti kontosid\n"
@@ -26012,12 +26298,12 @@ msgstr ""
 "\n"
 "J�tkamiseks palun vajuta nuppu \"J�rgmine\". "
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 
 #: shell/importer/import.glade.h:1
@@ -26051,41 +26337,42 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "Importijad"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "�ra impordi"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Seda k�simust mitte rohkem esitada"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution suudab importida andmeid j�rgnevatest failidest:"
 
-#: shell/main.c:96
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:102
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Evolution l�petab t�� ..."
 
-#: shell/main.c:227
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:266
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -26095,79 +26382,114 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:250
+#: shell/main.c:290
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:259
+#: shell/main.c:298
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Seda k�simust mitte rohkem esitada"
 
-#: shell/main.c:394
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:485
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Keela tiitelkuva"
 
-#: shell/main.c:487
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Impordi alustamine"
 
-#: shell/main.c:489
+#: shell/main.c:532
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Impordi alustamine"
 
-#: shell/main.c:491
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr ""
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:493
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:542
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Bonobo komponentide s�steemi l�htestamine nurjus"
-
-#: tools/evolution-addressbook-abuse.c:80
-#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-abuse.c:81
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Viga vaikimisi aadressiraamatu laadimisel."
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Sisendfail"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "V�ljundfail"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr ""
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Lisa manus..."
+
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:327
+#, fuzzy
+msgid "Description of the attachment."
+msgstr "Kirjeldus sisaldab"
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:329
+#, fuzzy
+msgid "Default subject for the message."
+msgstr "L�ikab valitud s�numid"
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "Kausta �mbernimetamine eba�nnestus: %s"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:3
 #, fuzzy
 msgid "Copy Contact(s) to Another Folder..."
@@ -26261,7 +26583,7 @@ msgstr "k�esoleva hetkega"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr "_Tegevused"
 
@@ -26381,7 +26703,7 @@ msgid "Print this item"
 msgstr "Tr�kib elemendi"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "Salvesta"
 
@@ -26408,7 +26730,7 @@ msgstr "Salvestab elemendi kettale"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Fail"
 
@@ -26661,7 +26983,7 @@ msgstr "Esitab s�numeid jutul�ngadena"
 msgid "_Expunge"
 msgstr "_Puhasta"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Kaust"
 
@@ -26927,7 +27249,7 @@ msgstr "�lesande vastus"
 
 #: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Post a reply to a message message in a Public folder"
+msgid "Post a reply to a message in a Public folder"
 msgstr "Kontrolli uusi s�numeid k�ikides kaustades"
 
 #: ui/evolution-mail-message.xml.h:64
@@ -27093,7 +27415,7 @@ msgstr "Tsitaadina"
 msgid "_Resend..."
 msgstr "_Muuda nime..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "T_��riistad"
 
@@ -27108,12 +27430,12 @@ msgstr "Sulgeb akna"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Close"
 msgstr "_Sulge"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "_Vaade"
 
@@ -27121,6 +27443,10 @@ msgstr "_Vaade"
 msgid "Attach"
 msgstr "Manusta"
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Lisab s�numile faili"
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Sulge fail"
@@ -27291,7 +27617,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Salvestab elemendi kettale ja sulgeb dialoogiakna"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr "_Abi"
 
@@ -27478,129 +27804,119 @@ msgstr "_Pilot'i s�tted"
 
 #: ui/evolution.xml.h:27
 #, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "_Pilot'i s�tted"
-
-#: ui/evolution.xml.h:28
-#, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Loo _uus kaust..."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Saada / v�ta vastu"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr ""
 "Saadab j�rjekorras olevad v�ljaminevad kirjad ja t�mbab �ra uued kirjad."
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "E-posti seadistamine"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "E-posti seadistamine"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "N�ita infot Ximian Evolutioni kohta"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Saada veateade"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "Saada _veateade"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Saada veateade kasutades Bug Buddy't"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "L�litab kaustade riba sisse v�i v�lja"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "L�litab kiirvkorralduste riba sisse v�i v�lja"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "L�litab autonoomse reziimi sisse v�i v�lja"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "N�itab valitud kausta"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolutioni _KKK"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolutionist..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "Ko_peeri..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Kaustade riba"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Kaust"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "_Mine kausta"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "_Impordi..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_T�sta mujale..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Uus"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "Uus k_aust"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "Loo _uus kaust..."
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Muuda nime..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Saada / V�ta vastu"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "Kiir_valikute riba"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "Kiir_valik"
@@ -27687,9 +28003,8 @@ msgstr "Kategooriaga"
 msgid "_Tasks"
 msgstr "_�lesanne"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr "UTC"
 
@@ -27714,21 +28029,21 @@ msgstr ""
 "Vasaku hiirenupuga saab kaarti suurendada ja ajav��ndit valida.\n"
 "Paremat hiirenupuga saab kaarti v�hendada."
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "K�e_solev vaade"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:357
+#: widgets/menus/gal-view-menus.c:350
 #, fuzzy
 msgid "Custom View"
 msgstr "K�e_solev vaade"
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "Kirjelda vaateid"
 
@@ -27739,19 +28054,19 @@ msgid "MTWTFSS"
 msgstr "ETKNRLP"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1070
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "Praegu"
 
-#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr "T�na"
 
-#: widgets/misc/e-cell-date-edit.c:797
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Aeg peab olema j�rgnevas vormingus: %s"
@@ -27760,81 +28075,81 @@ msgstr "Aeg peab olema j�rgnevas vormingus: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Protsendi v��rtus peab olema 0 - 100."
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Balti"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Kesk-Euroopa"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Hiina"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Kirillitsa"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Kreeka"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Jaapani"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Korea"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "T�rgi"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "L��ne-Euroopa"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Traditsiooniline"
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr "Lihtsustatud"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ukraina"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 #, fuzzy
 msgid "Visual"
 msgstr "Visalia"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Tundmatu m�rgistik: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Sisesta kasutatav m�rgistik"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Muu..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Kodeering"
 
@@ -27842,11 +28157,12 @@ msgstr "Kodeering"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Otsinguredaktor"
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
@@ -27865,66 +28181,441 @@ msgstr "Lisa salvestatud otsingutesse"
 msgid "_Advanced..."
 msgstr "Edasij�udnutele..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "Info"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "Viga"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "K�simus"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "S�num"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "Seda teadet enam mitte n�idata."
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Otsi"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 #, fuzzy
 msgid "_Find Now"
 msgstr "Otsi n��d"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "Puhasta"
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:833
+msgid "Item ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:840
+msgid "Subitem ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:847
+#, fuzzy
+msgid "Text"
+msgstr "Test"
+
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Puhasta"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Otsi n��d"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Personal Addressbook Server"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Evolution Addressbook minicard viewer"
+
+# !PARANDA!
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Evolution'i kalendri iTip/iMip vaataja"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr ""
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolution Addressbook minicard viewer"
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Impordib VKaardi-vormingus failid Evolution'i."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "A Bonobo control for an address popup."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Bonobo v�li aadressi jaoks."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "A sample Bonobo control which displays an addressbook."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Control that displays an Evolution addressbook minicard."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Evolution component for handling contacts."
+
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "Factory for the Addressbook Minicard control"
+
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "Factory for the Addressbook's address displayer"
+
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "Factory for the sample Addressbook control"
+
+#, fuzzy
+#~ msgid "380"
+#~ msgstr "389"
+
+#, fuzzy
+#~ msgid "<- _Remove"
+#~ msgstr " _Eemalda"
+
+#, fuzzy
+#~ msgid "<< Fewer Options"
+#~ msgstr "H��lestus"
+
+#, fuzzy
+#~ msgid "DN Customization"
+#~ msgstr "Info puudub"
+
+#, fuzzy
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution'i alarm "
+
+#, fuzzy
+#~ msgid "Mappings"
+#~ msgstr "Veerised"
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "Vali k�ik"
+
+#, fuzzy
+#~ msgid "_Add ->"
+#~ msgstr "_Lisa"
+
+#, fuzzy
+#~ msgid "_Add Mapping"
+#~ msgstr "Lisa tegevus"
+
+#, fuzzy
+#~ msgid "_Add to DN"
+#~ msgstr "Lisa tegevus"
+
+#, fuzzy
+#~ msgid "_Always"
+#~ msgstr "Alarmid"
+
+#, fuzzy
+#~ msgid "_Delete Mapping"
+#~ msgstr "_Kustuta k�ik"
+
+#, fuzzy
+#~ msgid "_Edit Mapping"
+#~ msgstr "_Muuda kohtumist"
+
+#, fuzzy
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Evolution'i alarm "
+
+#, fuzzy
+#~ msgid "_More Options >>"
+#~ msgstr "_H��lestus"
+
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "Konto %d"
+
+#, fuzzy
+#~ msgid "account-editor"
+#~ msgstr "kontaktide-nimekirja-redaktor"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Muuda kontaktide nimekirja"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Nimetu kontaktide nimekiri"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d n�itamata)"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "_Kontaktid..."
+
+#~ msgid "Phone Types"
+#~ msgstr "Telefoni t��bid"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "Kustutada kontakt?"
+
+#, fuzzy
+#~ msgid "Display Cards?"
+#~ msgstr "Kuva"
+
+#, fuzzy
+#~ msgid "Display Cards"
+#~ msgstr "Kuva"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Bonobo v�li �lesannete loendi kuvamiseks."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Bonobo n�idisv�li kalendri kuvamiseks."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Evolution'i kalendrihaldamise komponent."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Evolution'i kalendrihaldamise komponent."
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "GNOME l�htestamine nurjus"
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders.  You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "See on meili-meeldetuletus, aga Evolution ei toeta veel seda t��pi "
+#~ "meeldetuletusi. Seet�ttu ei saa selle meeldetuletuse seadistusi muuta."
+
+#, fuzzy
+#~ msgid "st"
+#~ msgstr "1."
+
+#, fuzzy
+#~ msgid "nd"
+#~ msgstr "2."
+
+#, fuzzy
+#~ msgid "rd"
+#~ msgstr "3."
+
+#~ msgid "th"
+#~ msgstr "."
+
+#, fuzzy
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "Ei saa laadida Bonobot"
+
+#~ msgid "Print Calendar"
+#~ msgstr "Tr�ki kalender"
+
+#~ msgid ""
+#~ "Could not create the tasks view.  Please check your ORBit and OAF setup."
+#~ msgstr ""
+#~ "Ei suutnud tekitada �lesannete vaadet.  Kontrolli oma ORBit ja OAF "
+#~ "seadistust."
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolution t�stis sinu kalendrikaustas olnud �lesanded �le uude �lesannete "
+#~ "kausta."
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution has tried to take the tasks that were in your calendar folder "
+#~ "and migrate them to the new tasks folder.\n"
+#~ "Some of the tasks could not be migrated, so this process may be attempted "
+#~ "again in the future."
+#~ msgstr ""
+#~ "Evolution �ritas t�sta sinu kalendrikaustas olnud �lesandeid �le uude "
+#~ "�lesannete kausta.\n"
+#~ "M�nda �lesannetest ei �nnestunud �mber t�sta. Seda operatsiooni v�ib "
+#~ "tulevikus uuesti �ritada."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "`%s' ei suudetud avada, �htegi elementi kalendrikaustast �le kanda ei "
+#~ "saanud."
+
+#, fuzzy
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "`%s' laadimiseks vajalik meetod puudub. �htegi elementi kalendrikaustast "
+#~ "�le kanda ei ole v�imalik."
+
+#, fuzzy
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Impordib VKaardi-vormingus failid Evolution'i."
+
+#, fuzzy
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Impordib VKaardi-vormingus failid Evolution'i."
+
+#, fuzzy
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Impordib VKaardi-vormingus failid Evolution'i."
+
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr ""
+#~ "Ei saa k�tte s�numit %s kaustast %s\n"
+#~ "  %s"
+
+#~ msgid "Warning!"
+#~ msgstr "Hoiatus!"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Bonobo komponentide s�steemi l�htestamine nurjus"
+
+#~ msgid "minute"
+#~ msgstr "minut"
+
+#~ msgid "hour"
+#~ msgstr "tund"
+
+#~ msgid "week"
+#~ msgstr "n�dal"
+
+#~ msgid "year"
+#~ msgstr "aasta"
+
+#~ msgid "Add action"
+#~ msgstr "Lisa tegevus"
+
+#~ msgid "Add criterion"
+#~ msgstr "Lisa tingimus"
+
+#, fuzzy
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "Hoiatus: salvestamata s�num"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Bonobo komponentide s�steemi l�htestamine nurjus"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Impordib Outlook Express 4 faile Evolution'i"
+
+#~ msgid "Really delete account?"
+#~ msgstr "Kas t�esti kustutame konto?"
+
+#, fuzzy
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Kuvab j�rgmise lugemata s�numi"
+
+#~ msgid "US-Letter"
+#~ msgstr "US-Letter"
+
+#, fuzzy
+#~ msgid "Add Signature"
+#~ msgstr "Allkirja salvestamine"
+
+#, fuzzy
+#~ msgid "Account %d"
+#~ msgstr "Konto"
+
+#, fuzzy
+#~ msgid "_Variable-width:"
+#~ msgstr "Muutlik"
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): GNOME-VFS l�htestamine nurjus"
+#~ msgid "All folders"
+#~ msgstr "K�ik kaustad"
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): GNOME l�htestamine nurjus"
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "Aprill"
+
+#, fuzzy
+#~ msgid "Display Options"
+#~ msgstr "N�ita h��lestusi"
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Kaustad, mille nimi algab stringiga:"
+
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "Vali fail"
+
+#~ msgid "Marquette"
+#~ msgstr "Marquette"
+
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Bonobo laadimine eba�nnestus.\n"
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Evolution'i kalendrihaldamise komponent."
+
+#~ msgid "Evolution installation"
+#~ msgstr "Evolutioni installimine"
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution ei suutnud luua kataloogi\n"
+#~ "%s:\n"
+#~ "%s"
+
+#~ msgid "New..."
+#~ msgstr "Uus..."
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Kausta nimi ei tohi sisaldada kaldkriipse."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Ei leidnud Bug Buddy't sinu $PATH'ist."
+
+#~ msgid "Don't remove"
+#~ msgstr "�ra eemalda"
+
+#~ msgid "Active connections"
+#~ msgstr "Aktiivsed �hendused"
+
+#~ msgid "Host"
+#~ msgstr "Host"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Bonobo komponentide s�steemi l�htestamine nurjus"
+
+#~ msgid "Output File"
+#~ msgstr "V�ljundfail"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "_Pilot'i s�tted"
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "E-posti seadistamine"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Personal Addressbook Server"
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): GNOME-VFS l�htestamine nurjus"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): GNOME l�htestamine nurjus"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 
 #, fuzzy
 #~ msgid "_Configure..."
@@ -27960,9 +28651,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "Copy selected messages"
 #~ msgstr "Kopeeri valitud s�numid"
 
-#~ msgid "Cut selected messages"
-#~ msgstr "L�ikab valitud s�numid"
-
 #, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr " _Eemalda"
@@ -28001,9 +28689,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ "Importija ei ole valmis.\n"
 #~ "Proovin 5 sekundi p�rast uuesti."
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Evolution'i impordiassistent"
-
 #, fuzzy
 #~ msgid "_Preferences..."
 #~ msgstr "E_i kordu"
@@ -28114,9 +28799,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ "S�numi kuup�eva v�rreldakse filtreerimise\n"
 #~ "hetkega v�i vKausta avamise hetkega."
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolution'i uudiseredaktor"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "Oled sa kindel, et soovid seda uudistekontot kustutada?"
 
@@ -28127,9 +28809,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "News Servers"
 #~ msgstr "_Uudistekanalid"
 
-#~ msgid "Source"
-#~ msgstr "Allikas"
-
 #~ msgid "Source Information"
 #~ msgstr "Allika info"
 
@@ -28259,10 +28938,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgstr "_Redaktor"
 
 #, fuzzy
-#~ msgid " New "
-#~ msgstr "Uus"
-
-#, fuzzy
 #~ msgid "Advanced Options"
 #~ msgstr "Katkesta tegevus"
 
@@ -28560,9 +29235,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "New Contact _List"
 #~ msgstr "Uus kontaktide _nimekiri"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Muuda aadressiraamatut"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Uus aadressiraamat"
 
@@ -28809,9 +29481,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "Regions"
 #~ msgstr "Regioonid"
 
-#~ msgid "Al_l stations:"
-#~ msgstr "_K�ik ilmajaamad:"
-
 #~ msgid "All _folders:"
 #~ msgstr "_K�ik kaustad:"
 
@@ -28830,9 +29499,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "(No name)"
 #~ msgstr "(Nimi puudub)"
 
-#~ msgid "New List"
-#~ msgstr "Uus nimekiri"
-
 #~ msgid "Configure the calendar's settings"
 #~ msgstr "Kalendri seadistamine"
 
diff --git a/po/eu.po b/po/eu.po
index e7b8e72bba..ecf62aabb6 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1.0\n"
-"POT-Creation-Date: 2002-10-28 16:49-0500\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2001-05-25 13:35+0200\n"
 "Last-Translator: Josu Wali�o <josu@elhuyar.com>\n"
 "Language-Team: Euskara\n"
@@ -13,40 +13,52 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "LDIF fitxategiak Evolution-era inportatzeko fabrika."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution-en Inportatzeko laguntzailea"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "LDIF fitxategiak Evolution-era inportatzen ditu."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution-en mezu-prestatzailea."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "VCard fitxategiak Evolution-era inportatzeko fabrika."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution-en mezu-prestatzailea."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "VCard fitxategiak Evolution-era inportatzen ditu."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Jaso honela"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Izena"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Helb. el."
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Nagusia"
 
@@ -56,16 +68,17 @@ msgstr "Nag"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Laguntzailea"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Lanekoa"
 
@@ -75,12 +88,12 @@ msgid "Bus"
 msgstr "Lan"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Atzeradeia"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Enpresakoa"
 
@@ -91,12 +104,13 @@ msgstr "Enp"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Etxekoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Erakundea"
@@ -107,18 +121,18 @@ msgstr "Erak"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Mugikorra"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "Autokoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Laneko faxa"
@@ -128,13 +142,13 @@ msgid "Bus Fax"
 msgstr "Lan fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Etxeko faxa"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Laneko 2.a"
 
@@ -143,43 +157,43 @@ msgid "Bus 2"
 msgstr "Lan 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Etxeko 2.a"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Bestelakoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Beste fax bat"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Bilagailua"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Irrati-telefonoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex-a"
@@ -190,15 +204,15 @@ msgid "TTY"
 msgstr "Teletipoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "2. helb. el."
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "3. helb. el."
@@ -222,6 +236,7 @@ msgid "Dep"
 msgstr "Sai"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Bulegoa"
@@ -231,6 +246,7 @@ msgid "Off"
 msgstr "Bul"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Kargua"
@@ -245,6 +261,7 @@ msgid "Prof"
 msgstr "Lanb"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Zuzendaria"
@@ -258,6 +275,7 @@ msgid "Ass"
 msgstr "Lag"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Goitizena"
@@ -267,16 +285,19 @@ msgid "Nick"
 msgstr "Goit"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1418
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Ezkontidea"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1459
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Oharra"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "Egutegi-URIa"
 
@@ -294,245 +315,346 @@ msgid "FBUrl"
 msgstr "LOUrl"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Default server calendar"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "Egutegia"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "Urteurrena"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Urteu"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Jaioteguna"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategoriak"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Deitura"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "Autokoa"
+
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-card-simple.c:893
 #: addressbook/backend/ebook/e-destination.c:706
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Kontaktu-zerrenda izengabea"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "VCard anitz"
+#: addressbook/backend/ebook/e-card.c:1308
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Izen osoa"
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "%s(r)en VCard-a"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "Helbi_dea:"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "Helbide-txartelak"
+
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "Jaioteguna"
+
+#: addressbook/backend/ebook/e-card.c:1355
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URLa"
+
+#: addressbook/backend/ebook/e-card.c:1369
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Erakundea"
+
+#: addressbook/backend/ebook/e-card.c:1390
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Funtzioa"
+
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+#, fuzzy
+msgid "Mailer"
+msgstr "Posta"
+
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "_Libre/okupatuta URLa:"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Egutegia"
+
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Kontaktua ezabatu?"
+
+#: addressbook/backend/ebook/e-card.c:1480
+#, fuzzy
+msgid "Category List"
+msgstr "Kategoria da"
+
+#: addressbook/backend/ebook/e-card.c:1487
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1494
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1501
+#, fuzzy
+msgid "List"
+msgstr "Lista"
+
+#: addressbook/backend/ebook/e-card.c:1508
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Beste helbide bat"
+
+#: addressbook/backend/ebook/e-card.c:1515
+#, fuzzy
+msgid "Arbitrary"
+msgstr "Amritsar"
+
+#: addressbook/backend/ebook/e-card.c:1522
+#, fuzzy
+msgid "ID"
+msgstr "jn."
+
+#: addressbook/backend/ebook/e-card.c:1529
+#, fuzzy
+msgid "Last Use"
+msgstr "Itsatsi"
+
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "Puntuazioa"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-#: addressbook/backend/ebook/load-pine-addressbook.c:22
-#: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
-#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "Ezin izan da Bonobo hasieratu"
 
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:2978
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Bilatzen..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Kargatzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "Izen bereizitua (DN)"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "Helbide elektronikoa"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP zerbitzariarekin konektatzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "LDAP zerbitzarian txartela gehitzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "LDAP zerbitzaritik txartela kentzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1572
-#: addressbook/backend/pas/pas-backend-ldap.c:1575
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP zerbitzariko txartela aldatzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "LDAP bilaketaren emaitzak jasotzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 #, fuzzy
 msgid "Error performing search"
 msgstr "Errorea txartela kentzean"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Sinkronizazio-helbide lehenetsia:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Ezin izan da kurtsorea kargatu\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook ez dago kargatuta\n"
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Ezin izan da wombat zerbitzaria abiarazi"
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Ezin izan da wombat abiarazi"
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr "Ezin izan da pilot-aren Helbidearen aplikazio-blokea irakurri"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Bonobo-ren kontrola helbide pop-up batentzat."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Bonobo-ren kontrola helbidea bistaratzeko."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Helbide-liburua bistaratzen duen mostrako Bonobo kontrola."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Configure access to LDAP directory servers here"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution-en helbide-liburuko minitxartela erakusten duen kontrola."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Editatu helbide-liburua"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Kontaktuak maneiatzeko Evolution-en osagaia"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Helbide-liburuko minitxartelak kontrolatzeko fabrika"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Helbide-liburuko helbideen pop-up-erako fabrika"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Helbide-liburuko helbideen bistaratzailearen fabrika"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
-msgstr "Helbide-liburuko helbideen pop-up-erako fabrika"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr "Mostrako helbide-liburuaren kontrolerako fabrika"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:611
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1067
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
 msgstr "Kontaktuak"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "Kontaktuen informazioa duen karpeta"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "LDAP zerbitzaria"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "Kontaktuen informazioa duen LDAP zerbitzaria"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public Contacts"
 msgstr "Kontaktuak"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public folder containing contact information"
 msgstr "Kontaktuen informazioa duen karpeta"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Kontaktua"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Sortu kontaktu berria"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Kontaktuen zerrenda berria"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "_Kontaktuen zerrenda"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Sortu kontaktu-zerrenda berria"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Ezin da LDAP zerbitzariarekin konektatu."
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -540,58 +662,49 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:648
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1193
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Errorea iragazki-informazioa kargatzean:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: addressbook/gui/component/addressbook-config.c:1630
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Kontuaren izena"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Zerbitzari-izena"
 
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
-msgid "Could not initialize gnome-vfs"
-msgstr "Ezin izan da gnome-vfs hasieratu"
+#: addressbook/gui/component/addressbook-config.c:1676
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Beste kontaktu batzuk"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "Ezin da helbide-liburua ireki"
-
-#: addressbook/gui/component/addressbook.c:480
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -599,7 +712,7 @@ msgstr ""
 "Ezin izan dugu helbide-liburu hori ireki.  Egiaztatu bide-izena\n"
 "badagoela eta atzitzeko baimena baduzula. "
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:522
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -610,7 +723,7 @@ msgstr ""
 "okerreko URIa idatzi duzula, edo LDAP zerbitzaria\n"
 "ez dabilela"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -622,7 +735,7 @@ msgstr ""
 "programa konpilatu behar duzu CVS iturburuetatik\n"
 "beheko estekatik OpenLDAP eskuratuz.\n"
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:537
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -633,12 +746,15 @@ msgstr ""
 "okerreko URIa idatzi duzula, edo LDAP zerbitzaria\n"
 "ez dabilela"
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:582
+#: addressbook/gui/component/addressbook.c:557
+msgid "Unable to open addressbook"
+msgstr "Ezin da helbide-liburua ireki"
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -646,38 +762,38 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:633
-#: addressbook/gui/component/addressbook.c:636
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 #, fuzzy
 msgid "Name begins with"
 msgstr "honela amaitzen da"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 #, fuzzy
 msgid "Email begins with"
 msgstr "honela amaitzen da"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategoria da"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Edozein eremuk hau dauka"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Aurreratua..."
 
-#: addressbook/gui/component/addressbook.c:956
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -685,7 +801,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:962
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -693,25 +809,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:968
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:975
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1050
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr "Edozein kategoria"
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "Karpeta-arakatzaileak bistaratuko duen URIa"
 
@@ -720,139 +836,126 @@ msgstr "Karpeta-arakatzaileak bistaratuko duen URIa"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/component/e-address-popup.c:478
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "Helb el. nagusia"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Hautatu ekintza bat"
 
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Sortu kontaktu berria \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Gehitu helbidea lehendik dagoen kontaktuari \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Helbide-liburuan kontsulta egiten..."
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Editatu kontaktu-informazioa"
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Gehitu kontaktuei"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Fusionatu helbide elektronikoa"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Desgaitu kontsultak"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Gaitu kontsultak (Arriskutsua!)"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "_Begiratu zein mota onartzen diren"
 
-#: addressbook/gui/component/ldap-config.glade.h:2
-msgid "1234"
+#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:5
 #, fuzzy
 msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-#, fuzzy
-msgid "380"
-msgstr "389"
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "636"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "666"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "<- _Remove"
-msgstr "_Kendu"
+msgid "Add LDAP Server"
+msgstr "LDAP zerbitzaria"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Aukerak"
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "Helbide-liburuaren iturburuak"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always"
 msgstr "Alarmak"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Anonymously"
 msgstr "Anonimoa"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -861,85 +964,66 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Connecting"
 msgstr "Connecticut"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
-msgid "DN Customization"
-msgstr "Ez dago informaziorik"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "E_zabatu"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Izen bereizitua:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
-msgid "Email Address:"
-msgstr "_Helbide elektronikoa:"
+msgid "Edit LDAP Server"
+msgstr "LDAP zerbitzaria"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
-msgid "Evolution Attribute"
-msgstr "Evolution-en alarma"
+msgid "Email Address:"
+msgstr "_Helbide elektronikoa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution-ek helbide elektroniko hau erabiliko du zu zerbitzarian "
 "autentifikatzeko"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution-ek helbide elektroniko hau erabiliko du zu zerbitzarian "
 "autentifikatzeko"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Finished"
 msgstr "_Bilatu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "Orokorra"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-#, fuzzy
-msgid "LDAP Attribute"
-msgstr "LDAP autentifikazioa"
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "LDAP Configuration Assistant"
 msgstr "Konfigurazioa"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Mappings"
-msgstr "Marjinak"
-
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_dagoen, maiztasun honekin"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -949,74 +1033,35 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:42
-msgid "Objectclasses Used in Evolution:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses Used on Server:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Bat"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-#, fuzzy
-msgid "R_estore Defaults"
-msgstr "Lehenespenak"
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-#, fuzzy
-msgid "Re_store Defaults"
-msgstr "Lehenespenak"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Bilaketa _barrutia: "
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
-#: calendar/gui/e-week-view.c:1240
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 msgid "Searching"
 msgstr "Bilaketa"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
-msgid "Select"
-msgstr "Hautatu denak"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Ezabatuta"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -1027,7 +1072,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1036,54 +1081,47 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Iturburu-informazioa"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Onartzen ez den eskema"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1091,7 +1129,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1100,7 +1138,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1108,17 +1146,17 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
 "directory tree. A search scope of \"sub\" will include all entries below "
 "your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1128,13 +1166,13 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -1144,7 +1182,7 @@ msgstr ""
 "Hau, deskargatzeko gehieneko txartel-kopurua da.  Zenbaki handiegia ezartzen "
 "baduzu, helbide-liburuaren funtzionamendua mantsotuko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1154,7 +1192,7 @@ msgstr ""
 "izan hemen \"Helbide elektronikoa\" ezartzen baduzu sarbide anonimoa beharko "
 "duzula zure ldap zerbitzarirako."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1164,7 +1202,7 @@ msgstr ""
 "Izen hau erabiliko da zure kontua identifikatzeko.  Bistaratzeko bakarrik "
 "erabiliko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1172,91 +1210,48 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Izen bereizitua (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "Using email address"
 msgstr "Helbide elektronikoa"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:108
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Gehitu"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-#, fuzzy
-msgid "_Add ->"
-msgstr "Gehitu"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-#, fuzzy
-msgid "_Add Mapping"
-msgstr "Gehitu ekintza"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-#, fuzzy
-msgid "_Add to DN"
-msgstr "Gehitu ekintza"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-#, fuzzy
-msgid "_Always"
-msgstr "Alarmak"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "Ezaba_tu dena"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Bistaratzea"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
-#, fuzzy
-msgid "_Distinguished Name (DN):"
-msgstr "Izen bereizitua (DN)"
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_Don't use SSL/TLS"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Deskarga-muga"
 
-#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1266,208 +1261,150 @@ msgstr "_Deskarga-muga"
 msgid "_Edit"
 msgstr "_Edizioa"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "_Editatu hitzordua"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-#, fuzzy
-msgid "_Evolution attribute:"
-msgstr "Evolution-en alarma"
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_If necessary "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "_LDAP attributes:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-#, fuzzy
-msgid "_More Options >>"
-msgstr "Au_kerak"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Ataka:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
-#, fuzzy
-msgid "_Restore Defaults"
-msgstr "Lehenespenak"
-
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Search base:"
 msgstr "Bilaketa-_oinarria:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "Zer_bitzariaren izena:"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Alarma-errepikaren denbora (minututan)"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
-#, fuzzy
-msgid "account-druid"
-msgstr "%d kontua"
-
-#: addressbook/gui/component/ldap-config.glade.h:132
-#, fuzzy
-msgid "account-editor"
-msgstr "contact-list-editor"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "cards"
 msgstr "Txartelik ez"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "connecting-tab"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:136
-msgid "edit_server_window_simple"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:97
 #, fuzzy
 msgid "general-tab"
 msgstr "Orokorra"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:139
-msgid "objectclasses-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "searching-tab"
 msgstr "Bilaketa"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
 msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Helbide-liburuko izen-hautaketaren interfazerako fabrika"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Kendu denak"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:699
-#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
-#: shell/e-shortcuts-view.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Kendu"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr "Kendu denak"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Kontaktuen zerrenda berria"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "Editatu kontaktu-informazioa"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
 msgid "Send HTML Mail?"
 msgstr "HTML mezua bidali?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
-msgstr "Editatu kontaktuen zerrenda"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
-msgid "Unnamed Contact List"
-msgstr "Kontaktu-zerrenda izengabea"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d ez da erakusten)"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr "Kontaktu izengabea"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+msgid "Source"
+msgstr "Iturburua"
+
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Hautatu kontaktuak helbide-liburutik"
 
-#: addressbook/gui/component/select-names/e-select-names.c:564
+#: addressbook/gui/component/select-names/e-select-names.c:648
 #, fuzzy
 msgid "Find contact in"
 msgstr "bidaltzaileak hau dauka"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Find"
+msgstr "Bilatu:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Hautatu izenak"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 #, fuzzy
 msgid "Selected Contacts:"
 msgstr "Kontaktua ezabatu?"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 #, fuzzy
 msgid "Show Contacts"
 msgstr "Kontaktu garrantzitsuenak"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid ""
 "Type a name into the entry, or\n"
 "select one from the list below:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
 msgstr "_Kategoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "_Karpeta:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr "Laguntzailearen i_zena:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr "Helbi_dea..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "_Urteurrena:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr "U_rtebetetzea:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "K_ontaktuak..."
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegoriak..."
@@ -1478,7 +1415,7 @@ msgstr "Lankidetza"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Kontaktu-editorea"
 
@@ -1487,7 +1424,7 @@ msgid "D_epartment:"
 msgstr "_Saila:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "Xehetasunak"
 
@@ -1529,1138 +1466,1185 @@ msgstr "E_rakundea:"
 msgid "P_rofession:"
 msgstr "_Lanbidea:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Telefono-motak"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "S_pouse:"
 msgstr "_Ezkontidea:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "This is the _mailing address"
 msgstr "_Hau da posta-helbidea"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Wants to receive _HTML mail"
 msgstr "HT_ML mezuak jaso nahi ditu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
-#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
-#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "E_zabatu..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "Kar_gua: "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "Zuze_ndariaren izena:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "_Goitizena:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Bulegoa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "Egu_tegi publikoaren URLa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "_Web orriaren helbidea:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:183
+#, fuzzy
+msgid "Editable"
+msgstr "Gaitu"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "Estatu Batuak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Aljeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr "Samoa amerikarra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Antarctica"
 msgstr "Antartika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr "Antigua eta Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Australia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Austria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr "Bielorrusia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belgika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia Herzegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr "Bouvet uhartea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brasil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
 msgstr "Indiako Ozeanoko Britainiar Lurraldea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr "Kanbodia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Kaiman uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
 msgstr "Erdialdeko Afrikar Errepublika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "Txad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Txile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "Txina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Christmas uhartea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr "Cocos Keeling uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Kolonbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr "Komoroak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Kongo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr "Cook uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr "Boli Kosta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Kroazia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Kuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Zipre"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Txekiar errepublika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Danimarka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr "Djibuti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr "Dominika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Dominikar errepublika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "Ekialdeko Timor"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Ekuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egipto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Ekuatore Ginea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Malvina uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Faroe uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fiji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Frantzia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Guyana frantsesa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Polinesia frantsesa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Hegoaldeko lurralde frantsesak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Alemania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Grezia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Groenlandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr "Ginea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr "Ginea Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr "Heard eta McDonald uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "Vatikano Hiriko Estatua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Hungaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Islandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Italia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Japonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Republic Of"
 msgstr "Koreako Errepublika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr "Kirgizistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr "Letonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libano"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxenburgo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Macau"
 msgstr "Macau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr "Mazedonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr "Maldivak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr "Marshall uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr "Martinika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr "Maurizio"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr "Mikronesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Moldova, Republic Of"
 msgstr "Moldaviako Errepublika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
 msgstr "Monako"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr "Maroko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr "Mozanbike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr "Birmania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr "Herbehereak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "Antilla herbeheretarrak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "Kaledonia berria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr "Zeelanda Berria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr "Norfolk uhartea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr "Iparraldeko Mariana uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr "Norvegia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr "Palestinako lurraldea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr "Papua Ginea Berria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr "Filipinak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr "Polonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr "Reunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr "Errumania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr "Errusiar Federakundea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts eta Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr "Santa Luzia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Saint Vincent eta Grenadinak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome eta Principe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr "Seychelleak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr "Sierra Leona"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr "Singapur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr "Eslovakia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr "Salomon uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr "Hegoafrika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Hegoaldeko Georgia eta Hegoaldeko Sandwich uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr "Espainia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr "Santa Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre eta Mikelune"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard eta Jan Mayen uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr "Swazilandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr "Suedia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr "Suitza"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr "Tadjikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzaniako Errepublika Batua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "Thailandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr "Trinidad eta Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr "Turkia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr "Turk eta Caico uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
 msgstr "Arabiar Emirerri Batuak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr "Erresuma Batua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr "Estatu Batuetako kanpoaldeko uharte txikiak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Virgin Islands, British"
 msgstr "Birjina uharteak (britainiarrak)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Virgin Islands, U.S."
 msgstr "Birjina uharteak (amerikarrak)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis eta Futuna uharteak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr "Mendebaldeko Sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr "Yemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr "Jugoslavia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zimbabwe"
 msgstr "Zimbawe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:459
 #, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
+msgid "Book"
+msgstr "Bodo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "Kontaktua ezabatu?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
+#, fuzzy
+msgid "Card"
+msgstr "Autokoa"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+#, fuzzy
+msgid "Is New Card"
+msgstr "Berria"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#, fuzzy
+msgid "Writable Fields"
+msgstr "Merril Field"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "Txad"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Kategoria-editorea ez dago erabilgarri."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:833
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "Kontaktu hau kategoria hauetakoa da:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Gorde kontaktua VCard gisa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "Teletipoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2440
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Ezin izan da eremu baten trepeta aurkitu: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Gehitu kontaktua azkar"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Editatu osorik"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Izen osoa"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "Helb. el."
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "Errorea fitxategia gordetzean: %s"
+
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "zerrenda"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:221
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2669,150 +2653,147 @@ msgstr ""
 "%s badago lehendik\n"
 "Gainidatzi nahi duzu?"
 
-#: addressbook/gui/contact-editor/file-exists.glade.h:1
-msgid "Confirm Overwrite"
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:2
-msgid "Don't bother translating this string.  It's not used."
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 #, fuzzy
 msgid "Overwrite"
 msgstr "Fitxategia gainidatzi?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "_2. helbidea:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Egiaztatu helbidea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Es_tatua:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "Helbi_dea:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "_Hiria:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Posta-kutxa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "E_statua/Probintzia:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "Pos_ta-kodea:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "Egiaztatu izen osoa"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "jn."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "and."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Miss"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Mr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Mrs."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Ms."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Izena:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Deitura:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Bigarrena:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Atzizkia:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Titulua:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "List _name:"
 msgstr "_Zerrendaren izena:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Members"
 msgstr "Kideak"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Type an email address or drag a contact into the list below:"
 msgstr "Idatzi helbide elektronikoa edo arrastatu kontaktua beheko zerrendara:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ezkutatu helbideak zerrenda honetara mezuak bidaltzean"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Kendu"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "Zerrenda berria"
+
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 msgid "Contact List Editor"
 msgstr "Kontaktu-zerrendaren editorea"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Gorde zerrenda VCard gisa"
 
@@ -2866,145 +2847,152 @@ msgstr ""
 "Kontaktu honen izen edo helbide elektroniko aldatua lehendik ere \n"
 "badago karpeta honetan. Hala ere gehitu nahi duzu?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:153
+#. FIXME: get the toplevel window...
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Bilaketa aurreratua"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Bilatu"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Txartelik ez"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "txartel bat"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d txartel"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:408
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:466
+#, fuzzy
+msgid "Query"
+msgstr "Quimper"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Errorea %s abiaraztean"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#, fuzzy
+msgid "Model"
+msgstr "Molde"
+
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
-#: addressbook/gui/widgets/e-addressbook-util.c:91
-#: addressbook/gui/widgets/e-minicard.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Errorea txartela aldatzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1141
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Behar bezala egin da"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Biltegia deskonektatuta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1171
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Ez da txartela aurkitu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Txartelaren ID hori badago lehendik"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokoloa ez da onartzen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
-#: camel/camel-service.c:739 camel/camel-service.c:779
-#: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:779
+#: camel/camel-service.c:849 camel/camel-service.c:892
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Autentifikazioak huts egin du."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autentifikazioa behar da"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "'%s' fitxategia ez dago "
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Beste errore bat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:63
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#, fuzzy
+msgid "_Discard"
+msgstr "Dinard"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Errorea zerrenda gehitzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
-#: addressbook/gui/widgets/e-addressbook-util.c:292
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Errorea txartela gehitzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Errorea zerrenda aldatzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
-#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1588
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Errorea txartela kentzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-msgid "Display Cards?"
-msgstr "Txartelak bistaratu?"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-msgid "Display Cards"
-msgstr "Txartelak bistaratu"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:213
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, fuzzy, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -3013,123 +3001,139 @@ msgstr ""
 "%d txartel txartelak izatea eskatu duzu. Hori dela-eta %d leiho berri\n"
 "agertuko dira pantailan. Ziur zaude txartel horiek bistaratu nahi dituzula?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Eraman txartela hona"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Kopiatu txartela hemen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Eraman txartelak hona"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Kopiatu txartelak hemen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "VCard anitz"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "%s(r)en VCard-a"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Mota"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Helbide-liburua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
-#: addressbook/gui/widgets/e-addressbook-view.c:813
-#: addressbook/gui/widgets/e-addressbook-view.c:1790
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gorde VCard gisa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "New Contact..."
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Kontaktuen zerrenda berria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Joan karpeta honetara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 #, fuzzy
 msgid "Import..."
 msgstr "_Inportatu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Bilatu kontaktuak"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Helbide-liburuaren iturburuak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot-en ezarpenak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:814
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Birbidali kontaktua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Bidali mezua kontaktuari"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:816
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Inprimatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Inprimatu gutun-azala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Copy to folder..."
 msgstr "Kopiatu karpeta honetan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Move to folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:826
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ebaki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:827
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:828
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 #, fuzzy
 msgid "Current View"
 msgstr "_Uneko ikuspegia"
@@ -3138,7 +3142,7 @@ msgstr "_Uneko ikuspegia"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3146,11 +3150,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1290
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3218,20 +3222,61 @@ msgstr "Beste telefono bat"
 msgid "Primary Phone"
 msgstr "Telefono nagusia"
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr "eta beste %d txartel."
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "eta beste txartel bat."
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "Gorde helbide-liburuan"
 
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+#, fuzzy
+msgid "Width"
+msgstr "Zabalera:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "Altuera:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+#, fuzzy
+msgid "Field"
+msgstr "Fairfield"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "Deitura"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+#, fuzzy
+msgid "Text Model"
+msgstr "Testu-tamai_na"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#, fuzzy
+msgid "Column Width"
+msgstr "Columbia"
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -3245,7 +3290,7 @@ msgstr ""
 "\n"
 "Egin klik bikoitza hemen kontaktu berria sortzeko. "
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 msgid ""
 "\n"
 "\n"
@@ -3255,21 +3300,41 @@ msgstr ""
 "\n"
 "Ez dago ikuspegi honetan erakusteko elementurik."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:452
+#, fuzzy
+msgid "Adapter"
+msgstr "Adrar"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Ezabatuta"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Zereginen ordena"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Txartelen ikuspegia"
 
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#, fuzzy
+msgid "GTK Tree View"
+msgstr "Astearen ikuspegia"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Inprimatu gutun-azala"
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Inprimatu txartelak"
 
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
 msgid "Print card"
 msgstr "Inprimatu txartela"
 
@@ -3342,7 +3407,6 @@ msgid "Include:"
 msgstr "Sartu:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Horizontala"
 
@@ -3362,17 +3426,16 @@ msgstr "Marjinak"
 msgid "Number of columns:"
 msgstr "Zutabe-kopurua:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Aukerak"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientazioa"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Orrialdea"
 
@@ -3388,9 +3451,7 @@ msgstr "Papera"
 msgid "Paper source:"
 msgstr "Paper-iturria:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Bertikala"
 
@@ -3450,43 +3511,167 @@ msgstr "_Letra-tipoa..."
 msgid "Untitled appointment"
 msgstr "Hitzordu izengabea"
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr "1."
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "2."
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "3."
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr "4."
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr "5."
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr "6."
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr "7."
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr "8."
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr "9."
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr "10."
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr "11."
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr "12."
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr "13."
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr "14."
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr "15."
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr "16."
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr "17."
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr "18."
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr "19."
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr "20."
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr "21."
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "22."
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "23."
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr "24."
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr "25."
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr "26."
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr "27."
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr "28."
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr "29."
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr "30."
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr "31."
+
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "Handia"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1721
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "Normala"
 
-#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "Txikia"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr "Definitu gabe"
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Errorea egutegiaren zerbitzariarekin komunikatzean"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ezin izan da pilot-aren Calendar aplikazio-blokea irakurri"
 
@@ -3494,87 +3679,78 @@ msgstr "Ezin izan da pilot-aren Calendar aplikazio-blokea irakurri"
 msgid "Default Priority:"
 msgstr "Lehentasun lehenetsia:"
 
-#: calendar/conduits/todo/todo-conduit.c:951
 #: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ezin izan da pilot-aren ToDo aplikazio-blokea irakurri"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Zereginen zerrenda bistaratzen duen Bonobo kontrola."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Egutegia bistaratzen duen mostrako Bonobo kontrola."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #, fuzzy
 msgid "Calendar and Tasks"
 msgstr "Egutegiaren eta zereginen ezarpenak"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Evolution-en mezu-prestatzailerako fabrika."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Egutegiaren eta zereginen ezarpenak"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Egutegia maneiatzeko Evolution-en osagaia."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution-en egutegiaren laneko laburpenaren osagaia."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Evolution Tasks control"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
 msgstr "Evolution-en Zereginen kontrolerako fabrika."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr "Egutegiaren iTip ikuspegiaren kontrolerako fabrika"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
-msgstr "Mostrako egutegi-kontrolerako fabrika"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Egutegi-osagaien editorearen elkarrizketak zentralizatzeko fabrika"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "Factory to create a component editor factory"
-msgstr "Osagaien editorearen fabrika sortzeko fabrika"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution-en berri-editorea"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Alarma bidezko jakinarazpen-zerbitzua"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution-en berri-editorea"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
 msgstr "Alarma bidezko jakinarazpen-zerbitzurako fabrika"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Starting:"
 msgstr "Hasi:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Ending:"
 msgstr "Amaitu:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr "baliogabeko ordua"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
 #, c-format
 msgid "Alarm on %s"
 msgstr "%s alarma"
@@ -3596,11 +3772,17 @@ msgstr "Alarma-errepikaren denbora (minututan)"
 msgid "_Edit appointment"
 msgstr "_Editatu hitzordua"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:741
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
+msgid "Warning"
+msgstr "Abisua"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:849
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3612,13 +3794,7 @@ msgstr ""
 "oroigarri hau mezua bidaltzeko konfiguratuta   \n"
 "dago. Oroigarri normala bistaratuko da."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Abisua"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:764
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3635,15 +3811,15 @@ msgstr ""
 "\n"
 "Ziur zaude programa hori exekutatu nahi duzula?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:778
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 msgid "Do not ask me about this program again."
 msgstr "Ez galdetu programa horri buruz berriro."
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "Ezin izan da GNOME hasieratu"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "Ezin izan da gnome-vfs hasieratu"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
 msgstr "Ezin izan da sortu alarma bidezko jakinarazpen-zerbitzuaren fabrika"
 
@@ -3659,36 +3835,36 @@ msgstr "Azalpenak hau dauka"
 msgid "Comment contains"
 msgstr "Iruzkinak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr "Ez dator bat"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr "%A, %Y %B %d"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:409 calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:416
 msgid "%a %d %b %Y"
 msgstr "%a, %Y %b %d"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:440 calendar/gui/calendar-commands.c:442
 msgid "%d %B %Y"
 msgstr "%Y %B %d"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%B %d"
 
@@ -3699,67 +3875,162 @@ msgstr ""
 "Ezin izan da egutegiaren ikuspegia sortu.  Egiaztatu ORBit eta OAF "
 "konfigurazioa."
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
+msgid "Calendar"
+msgstr "Egutegia"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "Hitzorduak eta gertaerak dituen karpeta"
+
+#: calendar/gui/calendar-component.c:75
+#, fuzzy
+msgid "Public Calendar"
+msgstr "Egu_tegi publikoaren URLa:"
+
+#: calendar/gui/calendar-component.c:76
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Hitzorduak eta gertaerak dituen karpeta"
+
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
+msgid "Tasks"
+msgstr "Zereginak"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "Egiteko elementuak dauzkan karpeta"
+
+#: calendar/gui/calendar-component.c:85
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Inprimatu txartelak"
+
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Egiteko elementuak dauzkan karpeta"
+
+#: calendar/gui/calendar-component.c:730
+msgid "New appointment"
+msgstr "Hitzordu berria"
+
+#: calendar/gui/calendar-component.c:730
+msgid "_Appointment"
+msgstr "_Hitzordua"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Sortu hitzordu berria"
+
+#: calendar/gui/calendar-component.c:735
+msgid "New meeting"
+msgstr "Bilera berria"
+
+#: calendar/gui/calendar-component.c:735
+msgid "_Meeting"
+msgstr "_Bilera"
+
+#: calendar/gui/calendar-component.c:736
+msgid "Create a new meeting request"
+msgstr "Sortu bilera-eskaera berria."
+
+#: calendar/gui/calendar-component.c:740
+msgid "New task"
+msgstr "Zeregin berria"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_Zeregina"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Sortu zeregin berria"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Hitzordu berria"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "_Hitzordua"
+
+#: calendar/gui/calendar-component.c:746
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Sortu hitzordu berria"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Pribatua"
 
-#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
+#: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Konfidentziala"
 
-#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
 msgid "Public"
 msgstr "Publikoa"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "I"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "H"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "M"
 
-#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
+#: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1165
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr "Okupatuta"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "Ez da hasi"
 
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "Egiten ari da"
 
-#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "Eginda"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3770,340 +4041,156 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
-#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
-#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:79
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "Bat ere ez"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Errepikatua"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Esleitua"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
-#: calendar/gui/e-meeting-model.c:862
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
+#: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr "Bai"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:863
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Ez"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Egunaren ikuspegia"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "Lan-astearen ikuspegia"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "Astearen ikuspegia"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "Hilabetearen ikuspegia"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
-msgid "Calendar"
-msgstr "Egutegia"
-
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr "Hitzorduak eta gertaerak dituen karpeta"
-
-#: calendar/gui/component-factory.c:76
-#, fuzzy
-msgid "Public Calendar"
-msgstr "Egu_tegi publikoaren URLa:"
-
-#: calendar/gui/component-factory.c:77
-#, fuzzy
-msgid "Public folder containing appointments and events"
-msgstr "Hitzorduak eta gertaerak dituen karpeta"
-
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
-#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1063
-msgid "Tasks"
-msgstr "Zereginak"
-
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
-msgstr "Egiteko elementuak dauzkan karpeta"
-
-#: calendar/gui/component-factory.c:86
-#, fuzzy
-msgid "Public Tasks"
-msgstr "Inprimatu txartelak"
-
-#: calendar/gui/component-factory.c:87
-#, fuzzy
-msgid "Public folder containing to-do items"
-msgstr "Egiteko elementuak dauzkan karpeta"
-
-#: calendar/gui/component-factory.c:750
-msgid "New appointment"
-msgstr "Hitzordu berria"
-
-#: calendar/gui/component-factory.c:750
-msgid "_Appointment"
-msgstr "_Hitzordua"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "Sortu hitzordu berria"
-
-#: calendar/gui/component-factory.c:755
-msgid "New meeting"
-msgstr "Bilera berria"
-
-#: calendar/gui/component-factory.c:755
-msgid "_Meeting"
-msgstr "_Bilera"
-
-#: calendar/gui/component-factory.c:756
-msgid "Create a new meeting request"
-msgstr "Sortu bilera-eskaera berria."
-
-#: calendar/gui/component-factory.c:760
-msgid "New task"
-msgstr "Zeregin berria"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "_Zeregina"
-
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "Sortu zeregin berria"
-
-#: calendar/gui/component-factory.c:765
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
-msgid "New All Day Appointment"
-msgstr "Hitzordu berria"
+msgid "Error while opening the calendar"
+msgstr "Errorea egutegiaren zerbitzariarekin komunikatzean"
 
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "All _Day Appointment"
-msgstr "_Hitzordua"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
 
-#: calendar/gui/component-factory.c:766
+#: calendar/gui/comp-editor-factory.c:473
 #, fuzzy
-msgid "Create a new all-day appointment"
-msgstr "Sortu hitzordu berria"
+msgid "Permission denied to open the calendar"
+msgstr "Baimena ukatuta"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "Egutegiak bistaratuko duen URIa"
 
-#: calendar/gui/control-factory.c:174
+#: calendar/gui/control-factory.c:172
 #, fuzzy
 msgid "The type of view to show"
 msgstr "Aldatu ikuspegia -> %s"
 
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Audio alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Mezu-alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Posta-alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Programa-alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Alarma ezezagunen aukerak"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Alarma-errepikapena"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-#, fuzzy
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
-msgstr ""
-"Mezu bidezko oroigarria da hau, baina Evolution-ek ez du era horretako "
-"oroigarririk onartzen oraingoz.  Ezingo dituzu editatu oroigarriaren aukerak."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Bistaratuko den mezua"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Mezuaren gorputza"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Jo soinua:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Errepikatu alarma"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Ireki programa:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Bidali"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Argumentu hauekin:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
-#: filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
 msgid "days"
 msgstr "egun "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "bider, maiztasun honekin:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
-#: filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "ordu "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
-#: filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutu "
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
-msgstr "%d egun"
-
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
-msgstr "egun bat"
-
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
-msgstr "%d aste"
-
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "aste bat"
-
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
-msgstr "%d ordu"
-
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
-msgstr "ordubete"
-
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
-msgstr "%d minutu"
-
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
-msgstr "minutu bat"
-
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
-msgstr "%d segundo"
-
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
-msgstr "segundo bat"
-
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "Jo soinua"
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Bistaratu mezua"
-
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "Bidali mezua"
-
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Exekutatu programa"
-
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
-msgstr "Egin beharreko ekintza ezezaguna"
-
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s hitzordua hasi aurretik"
-
-#: calendar/gui/dialogs/alarm-page.c:416
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s hitzordua hasi ondoren"
-
-#: calendar/gui/dialogs/alarm-page.c:421
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s hitzorduaren hasieran"
-
-#: calendar/gui/dialogs/alarm-page.c:430
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s hitzordua amaitu aurretik"
-
-#: calendar/gui/dialogs/alarm-page.c:433
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s hitzordua amaitu ondoren"
-
-#: calendar/gui/dialogs/alarm-page.c:438
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s hitzorduaren amaieran"
-
-#: calendar/gui/dialogs/alarm-page.c:462
-#, c-format
-msgid "%s at %s"
-msgstr "%s - %s"
-
-#: calendar/gui/dialogs/alarm-page.c:468
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "abiarazle-mota ezezagunaren %s"
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4114,46 +4201,63 @@ msgstr "Oinarriak"
 msgid "Date/Time:"
 msgstr "Data/Ordua:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Bistaratu mezua"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Jo soinua"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Oroigarriak"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Exekutatu programa"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Bidali mezua"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Laburpena:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Aukerak..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "geroago"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "lehenago"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "egun"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "hitzordu-amaiera baino"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "ordu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "minutu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "hitzordu-hasiera baino"
 
@@ -4177,7 +4281,7 @@ msgstr "30 minutu"
 msgid "60 minutes"
 msgstr "60 minutu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4203,7 +4307,8 @@ msgid "Days"
 msgstr "egun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Ostirala"
 
@@ -4216,7 +4321,8 @@ msgid "Minutes"
 msgstr "minutu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Astelehena"
 
@@ -4226,7 +4332,8 @@ msgid "S_un"
 msgstr "_Ig."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Larunbata"
 
@@ -4239,7 +4346,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Erakutsi aste-_zenbakiak data-nabigatzailean"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1137
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Igandea"
 
@@ -4258,7 +4366,8 @@ msgid "Task List"
 msgstr "Z_ereginen zerrenda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Osteguna"
 
@@ -4275,7 +4384,8 @@ msgid "Time format:"
 msgstr "Ordu-formatua:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Asteartea"
 
@@ -4284,7 +4394,8 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Asteazkena"
 
@@ -4327,7 +4438,7 @@ msgid "_Fri"
 msgstr "_Or."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Orokorra"
 
@@ -4373,156 +4484,160 @@ msgstr "A_z."
 msgid "before every appointment"
 msgstr "hitzordua hasi aurretik"
 
-#: calendar/gui/dialogs/cancel-comp.c:56
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:59
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Ziur zaude bilera hau bertan behera utzi eta ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/cancel-comp.c:65
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Ziur zaude zeregin hau bertan behera utzi eta ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/cancel-comp.c:74
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:77
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Ziur zaude egunkariko sarrera hau bertan behera utzi eta ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Gertaera ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Zeregina ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Egunkariko sarrera ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea itxi?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea itxi?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Gertaera hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Zeregin hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Egunkariko sarrera hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Errore ezezaguna: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr "- "
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
 msgstr "(Eginda "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 msgid "Completed "
 msgstr "Eginda "
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr "(Falta: "
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr "Falta: "
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Ezin izan da objektua eguneratu!"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
 #, fuzzy
 msgid "Could not update object"
 msgstr "Ezin izan da objektua eguneratu!"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Editatu hitzordua"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Hitzordua - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Zeregina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Egunkariko sarrera - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Laburpenik ez"
 
-#: calendar/gui/dialogs/comp-editor.c:1221
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
-#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: calendar/gui/dialogs/comp-editor.c:1322
-#: calendar/gui/dialogs/comp-editor.c:1346
-#: calendar/gui/dialogs/comp-editor.c:1370
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1331
+#: calendar/gui/dialogs/comp-editor.c:1355
+#: calendar/gui/dialogs/comp-editor.c:1379
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "Ezin da uneko bertsioa lortu!"
 
@@ -4580,87 +4695,100 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "Hitzordua"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Oroigarria"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Errepikapena"
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:433
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr "Antolaketa"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Bilera"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
+#, fuzzy
+msgid "Start date is wrong"
+msgstr "Hasiera-data"
+
+#: calendar/gui/dialogs/event-page.c:610
+msgid "End date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:633
+#, fuzzy
+msgid "Start time is wrong"
+msgstr "_Hasiera-ordua:"
+
+#: calendar/gui/dialogs/event-page.c:640
+msgid "End time is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "E_gun osoko gertaera"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "_Okupatuta"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Sailkapena"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "Kon_fidentziala"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Data eta ordua"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "L_ibre"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "K_okalekua:"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_batua"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "_Publikoa"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Erakutsi ordua honela"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Labu_rpena:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Kontaktuak..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "_Amaiera-ordua:"
@@ -4669,19 +4797,23 @@ msgstr "_Amaiera-ordua:"
 msgid "_Start time:"
 msgstr "_Hasiera-ordua:"
 
-#: calendar/gui/dialogs/meeting-page.c:414
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr "Antolatzailea behar da."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "Pertsona hori lehendik dago bileran!"
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Delegatu ..."
 
@@ -4722,16 +4854,11 @@ msgid "Member"
 msgstr "Kidea"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Funtzioa"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
@@ -4739,13 +4866,6 @@ msgstr "Funtzioa"
 msgid "Status"
 msgstr "Egoera"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "Mota"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4756,106 +4876,87 @@ msgid "_Change Organizer"
 msgstr "_Aldatu antolatzailea"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr "_Gonbidatu beste batzuk..."
 
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-#, fuzzy
-msgid "st"
-msgstr "1."
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:75
 #, fuzzy
-msgid "nd"
-msgstr "2."
+msgid "This and Future Instances"
+msgstr "Wallis eta Futuna uharteak"
 
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
+#: calendar/gui/dialogs/recur-comp.c:77
 #, fuzzy
-msgid "rd"
-msgstr "3."
+msgid "All Instances"
+msgstr "Estazio _guztiak:"
 
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-msgid "th"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution-ek editatu ezin dituen errepikapenak dauzka hitzordu honek."
 
-#: calendar/gui/dialogs/recurrence-page.c:898
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "-"
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 #, fuzzy
 msgid "first"
 msgstr "zerrenda"
 
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "segundo "
 
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
 #, fuzzy
 msgid "third"
 msgstr "Bestelakoa"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 #, fuzzy
 msgid "fourth"
 msgstr "Iparraldea"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 #, fuzzy
 msgid "last"
 msgstr "zerrenda"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 #, fuzzy
 msgid "Other Date"
 msgstr "Beste fax bat"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "eguna"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "-"
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "aldiz"
 
@@ -4919,24 +5020,29 @@ msgstr "aste"
 msgid "year(s)"
 msgstr "urte"
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr "Bileraren informazioa sortu da. Bidali?"
 
-#: calendar/gui/dialogs/send-comp.c:59
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Bilerari buruzko informazioa aldatu egin da. Bertsio eguneratua bidali?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
 msgstr "Zeregina esleitzeko informazioa sortu da. Bidali?"
 
-#: calendar/gui/dialogs/send-comp.c:70
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Zereginari buruzko informazioa aldatu egin da. Bertsio eguneratua bidali?"
 
+#: calendar/gui/dialogs/task-details-page.c:397
+#, fuzzy
+msgid "Completed date is wrong"
+msgstr "Eginda "
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -4947,42 +5053,40 @@ msgstr "% Osatuta"
 msgid "Date Completed:"
 msgstr "Osatze-data:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
-msgid "Needs Action"
-msgstr "Ekintza behar du"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Lanean"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:860
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr "URLa:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Lehentasuna:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Egoera:"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
-#: calendar/gui/dialogs/task-editor.c:216
-#: calendar/gui/dialogs/task-editor.c:261
-#: calendar/gui/dialogs/task-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr "Esleipena"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
+#: calendar/gui/dialogs/task-page.c:527
+msgid "Due date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Azalpena:"
 
@@ -4990,139 +5094,236 @@ msgstr "Azalpena:"
 msgid "Sta_rt Date:"
 msgstr "Ha_siera-data:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Kontaktuak..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Mugaeguna:"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d egun"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "egun bat"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d aste"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "aste bat"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d ordu"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "ordubete"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutu"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "minutu bat"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d segundo"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "segundo bat"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Bidali mezua"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Egin beharreko ekintza ezezaguna"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s hitzordua hasi aurretik"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s hitzordua hasi ondoren"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s hitzorduaren hasieran"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s hitzordua amaitu aurretik"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s hitzordua amaitu ondoren"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s hitzorduaren amaieran"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s - %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "abiarazle-mota ezezagunaren %s"
+
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "0%"
 msgstr "%0"
 
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "10%"
 msgstr "%10"
 
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "20%"
 msgstr "%20"
 
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:418
 #, c-format
 msgid "30%"
 msgstr "%30"
 
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:419
 #, c-format
 msgid "40%"
 msgstr "%40"
 
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:420
 #, c-format
 msgid "50%"
 msgstr "%50"
 
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:421
 #, c-format
 msgid "60%"
 msgstr "%60"
 
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:422
 #, c-format
 msgid "70%"
 msgstr "%70"
 
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:423
 #, c-format
 msgid "80%"
 msgstr "%80"
 
-#: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-calendar-table.c:424
 #, c-format
 msgid "90%"
 msgstr "%90"
 
-#: calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-calendar-table.c:425
 #, c-format
 msgid "100%"
 msgstr "%100"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
-#: calendar/gui/e-week-view.c:1917
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1910
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
-#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
-#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Ireki"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 #, fuzzy
 msgid "_Save as..."
 msgstr "Gorde honela..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
-#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Inprimatu..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
-#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "E_baki"
 
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
-#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "Ko_piatu"
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
-#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Esleitu zeregina"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ma_rkatu zereginak 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
-#: calendar/gui/e-week-view.c:4240
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
-#: calendar/gui/e-calendar-table.c:1360
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Egin klik zeregina gehitzeko"
@@ -5131,8 +5332,8 @@ msgstr "Egin klik zeregina gehitzeko"
 msgid "Alarms"
 msgstr "Alarmak"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1096
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Eginda"
 
@@ -5161,8 +5362,8 @@ msgid "Start Date"
 msgstr "Hasiera-data"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:748
-#: shell/e-shortcuts.c:1051
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Laburpena"
 
@@ -5170,19 +5371,15 @@ msgstr "Laburpena"
 msgid "Task sort"
 msgstr "Zereginen ordena"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URLa"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:166
+#: e-util/e-time-utils.c:379
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y/%m/%d %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:161
+#: e-util/e-time-utils.c:388
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y/%m/%d %I:%M:%S %p"
 
@@ -5197,481 +5394,561 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:518
+#: calendar/gui/e-day-view-time-item.c:529
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutu-zatiketa"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A, %B %d"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Hitz_ordu berria"
 
-#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 #, fuzzy
 msgid "New Meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Inprimatu..."
 
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "_Joan gaurko egunera"
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Argitaratu libre/okupatuta informazioa"
 
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Postaren ezarpenak..."
 
-#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
-#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Gorde honela..."
 
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Antolatu _bilera"
 
-#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr "Egin _agerraldi hau aldagarri"
 
-#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "Errepikapen _soila"
+
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "Errepikatze-aldia"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d egun"
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "Errepikatze-aldia"
+
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr "%d aste"
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Every week on "
+msgstr "Evergreen"
+
+#: calendar/gui/e-itip-control.c:731
+#, fuzzy, c-format
+msgid "Every %d weeks on "
+msgstr "%d aste"
+
+#: calendar/gui/e-itip-control.c:739
+#, fuzzy
+msgid " and "
+msgstr "Harea"
+
+#: calendar/gui/e-itip-control.c:746
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:764
+#, fuzzy
+msgid "every month"
+msgstr "Hi_labete"
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:775
+#, fuzzy
+msgid "Every year"
+msgstr "Errepikatze-aldia"
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:831
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Amaiera: <b>"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Eginda "
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "iCalendar informazioa"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "iCalendar errorea"
 
-#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
-#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 msgid "An unknown person"
 msgstr "Pertsona ezezaguna"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Bat ere ez</i>"
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Location:"
 msgstr "K_okalekua:"
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Egoera:"
 
-#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:490
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Onartua"
 
-#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Ukatua"
 
-#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
-#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:444
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 msgid "Choose an action:"
 msgstr "Aukeratu ekintza bat:"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Eguneratu"
 
-#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ados"
 
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Onartu"
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Onartu oraingoz"
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Ukatu"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Bidali libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Eguneratu erantzun-emailearen egoera"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
-#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
-#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Utzi"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>(e)k bilera-informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Bileraren informazioa"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1326
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Bilera-proposamena"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b>(e)k bilera batean sartu nahi du."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Bilera-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b>(e)k bilera-informazio berria jaso nahi du."
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Bilera-eguneratzearen eskaera"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>(e)k bilera-eskaerari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Bilera-erantzuna"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b>(e)k bilera bertan behera utzi du."
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Bilera bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
-#: calendar/gui/e-itip-control.c:1245
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b>(e)k mezu ulertezina bidali du."
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Bilera-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>(e)k zeregin-informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1393
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Zeregin-proposamena"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du."
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Zeregin-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b>(e)k zereginaren informazio berria jaso nahi du."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Zeregin-eguneratzearen eskaera"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>(e)k zeregin-esleipenari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Zereginaren erantzuna"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Zeregina bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Zeregin-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b>(e)k libre/okupatuta informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b>(e)k libre/okupatuta informazioa eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Libre/okupatuta eskaera"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b>(e)k libre/okupatuta eskaerari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Libre/okupatuta erantzuna"
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Libre/okupatuta mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1541
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
 
-#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Eranskinak ez du baliozko egutegi-mezurik"
 
-#: calendar/gui/e-itip-control.c:1441
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Errorea izan da datuak deskargatzean"
 
-#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1916
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Ezin izan da egutegi-fitxategia eguneratu!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Partaidearen egoera ezin da eguneratu elementua ez dagoelako"
 
-#: calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1739
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea dagoelako!\n"
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:2008
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Partaidearen egoera ezin izan da eguneratu\n"
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2206
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Hautatu karpeta"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Hautatu karpeta"
@@ -5713,222 +5990,226 @@ msgstr "data-amaiera"
 msgid "date-start"
 msgstr "data-hasiera"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Mahaiburuak"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr "Beharrezko partaideak"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Aukerako partaideak"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Resources"
 msgstr "Baliabidea"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr "Indibiduala"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:831
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "Taldea"
 
-#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "Baliabidea"
 
-#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr "Gela"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr "Mahaiburua"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr "Beharrezko partaidea"
 
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
+#: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr "Aukerako partaidea"
 
-#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
+#: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr "Ez-partaidea"
 
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+msgid "Needs Action"
+msgstr "Ekintza behar du"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr "Behin-behinekoa"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:879
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr "Delegatua"
 
-#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 msgid "In Process"
 msgstr "Egiten ari da"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2114
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
+#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a, %Y/%m/%d"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Bulegotik kanpo"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Ez dago informaziorik"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "Au_kerak"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Erakutsi lan-orduak _bakarrik"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Erakutsi _txikiagotuta"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Eguneratu Libre/okupatuta"
 
-#: calendar/gui/e-meeting-time-sel.c:544
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr "Au_tomatikoki hautatu"
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr "_Pertsona eta baliabide guztiak"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Pert_sona guztiak eta baliabide bat"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "_Beharrezko pertsonak"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Beharrezko pertsonak eta ba_liabide bat"
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Bilera _hasteko ordua:"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Bilera amai_tzeko ordua:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
 #: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ezin izan dira zereginak kargatu`%s'(e)n"
 
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s'kargatzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Errorea %s abiaraztean"
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Egite-data"
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/gnome-cal.c:1541
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s'irekitzeko behar den metodoa ez da onartzen"
 
-#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1581
+#: calendar/gui/gnome-cal.c:1563
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "%s alarma"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5936,7 +6217,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5944,7 +6225,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1996
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s - egutegia irekitzen"
@@ -6010,318 +6291,175 @@ msgstr "urria"
 msgid "September"
 msgstr "iraila"
 
-#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr "Antolatzailea ezarri behar da."
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Partaide bat behar da gutxienez"
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "Gertaera-informazioa"
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "Egunkari-informazioa"
 
-#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Egutegi-informazioa"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 #, fuzzy
 msgid "Updated"
 msgstr "Eguneratu"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
 #, fuzzy
 msgid "Refresh"
 msgstr "Freskatu zerrenda"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Libre/okupatuta informazioa (%s - %s)"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "iCalendar informazioa"
 
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Gertaerako partaidea izan behar duzu."
 
-#: calendar/gui/main.c:70
-#, fuzzy
-msgid "Could not activate Bonobo"
-msgstr "Ezin izan da Bonobo hasieratu"
-
-#: calendar/gui/main.c:99
-msgid "Could not create the component editor factory"
-msgstr "Ezin izan da sortu osagai-editorearen fabrika"
-
-#: calendar/gui/print.c:456
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:456
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:456
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:456
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:456
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:457
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:457
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:457
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:457
-msgid "9th"
-msgstr "9."
-
-#: calendar/gui/print.c:457
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:458
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:458
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:458
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:458
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:458
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:459
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:459
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:459
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:459
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:459
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:460
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:460
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:460
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:460
-msgid "24th"
-msgstr "24."
-
-#: calendar/gui/print.c:460
-msgid "25th"
-msgstr "25."
-
-#: calendar/gui/print.c:461
-msgid "26th"
-msgstr "26."
-
-#: calendar/gui/print.c:461
-msgid "27th"
-msgstr "27."
-
-#: calendar/gui/print.c:461
-msgid "28th"
-msgstr "28."
-
-#: calendar/gui/print.c:461
-msgid "29th"
-msgstr "29."
-
-#: calendar/gui/print.c:461
-msgid "30th"
-msgstr "30."
-
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "Ig"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Al"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Ar"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Az"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Og"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Or"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "Lr"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Hautatutako eguna (%a, %Y %b %d)"
 
-#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a, %b %d"
 
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a, %Y %d"
 
-#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
-#: calendar/gui/print.c:1896
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr "%a, %Y %b %d"
 
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Hautatutako astea (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Hautatutako hilabetea (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Hautatutako urtea (%Y)"
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "Zeregina"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "Egoera: %s"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Lehentasuna:"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Osatutako ehunekoa: %i"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr "URLa: %s"
 
-#: calendar/gui/print.c:2364
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriak: %s"
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Kontaktuak "
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Inprimatu egutegia"
-
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
-#: my-evolution/e-summary.c:633
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "Inprimatzeko aurrebista"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Inprimatu elementua"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Prestatu inprimaketa"
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Ezin izan da egutegiaren ikuspegia sortu.  Egiaztatu ORBit eta OAF "
-"konfigurazioa."
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "Bistaratu beharreko zeregin-karpetaren URIa"
 
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:472
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6333,93 +6471,54 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
-#: mail/mail-callbacks.c:2912
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "Ez galdetu berriro."
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Inprimatu txartelak"
 
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-"Egutegiaren karpetan zenituen zereginak hartu ditu Evolution-ek eta "
-"zereginen karpeta berrira migratu ditu automatikoki."
-
-#: calendar/gui/tasks-migrate.c:108
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-"Egutegiaren karpetan zenituen zereginak hartu eta zereginen karpeta berrira "
-"migratzen saiatu da Evolution.\n"
-"Zereginetako batzuk ezin izan dira migratu eta, ondorioz, prozesu hau "
-"geroago berriz egiten saiatuko da."
-
-#: calendar/gui/tasks-migrate.c:120
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-"Ezin izan da `%s' ireki; egutegiaren karpetatik ez da elementurik migratuko "
-"zereginen karpetara."
-
-#: calendar/gui/tasks-migrate.c:133
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-"`%s' kargatzeko behar den metodoa ez da onartzen; egutegiaren karpetatik  ez "
-"da elementurik migratuko zereginen karpetara."
-
-#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "iCalendar fitxategiak Evolution-era inportatzeko fabrika"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "iCalendar fitxategiak Evolution-era inportatzen ditu"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "VCalendar fitxategiak Evolution-era inportatzen ditu"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
 
-#: calendar/importers/icalendar-importer.c:168
-#, fuzzy, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Egutegi-mezua"
 
-#: calendar/importers/icalendar-importer.c:180
-#, fuzzy, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Ezin izan da biltegiarekin konektatu: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
+msgstr ""
 
-#: calendar/importers/icalendar-importer.c:483
+#: calendar/importers/icalendar-importer.c:404
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Oroigarria"
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Egutegi-mezua"
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:663
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6428,11 +6527,15 @@ msgstr ""
 "Evolution-ek Pine posta-fitxategiak aurkitu ditu.\n"
 "Evolution-era inportatu nahi dituzu?"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Egutegia"
 
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "'time-now'k 0 argumentu espero ditu"
@@ -8079,27 +8182,37 @@ msgstr "Pazifikoa/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifikoa/Yap"
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "Zifraketa honek ez du sinatzerik onartzen"
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Zifraketa honek ez du egiaztatzerik onartzen"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Zifraketa honek ez du enkriptatzerik onartzen"
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
+
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
+
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr "Ezin da cache-bidea sortu"
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ezin izan da kendu cache-sarrera: %s: %s"
@@ -8139,86 +8252,93 @@ msgstr "%s karpeta biltegiratzen"
 msgid "You must be working online to complete this operation"
 msgstr "Linean jardun behar duzu lanean eragiketa hau bukatzeko"
 
-#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-process.c:92
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Ezin izan da %s direktorioa sortu: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Karpetak sinkronizatzen"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errorea iragazkia analizatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errorea iragazkia exekutatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Ezin da spool-karpeta ireki"
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Ezin da spool-karpeta prozesatu"
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) mezua lortzen"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Ezin da mezua ireki"
 
-#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Huts egin du %d mezuan"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Karpeta sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d mezua hartzen"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr "Huts egin du mezua berreskuratzean"
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argumentu baliogabeak"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumentu baliogabeak"
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
-
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errorea iragazki-bilaketa exekutatzean: %s: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8227,7 +8347,7 @@ msgstr ""
 "Ezin izan da bilaketa-adierazpena analizatu: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8236,11 +8356,11 @@ msgstr ""
 "Errorea bilaketa-adierazpena exekutatzean: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Kontsulta egiten goiburuko ezezagunean: %s"
@@ -8269,7 +8389,7 @@ msgstr "Mezuak eramaten"
 msgid "Copying messages"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8277,72 +8397,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:711
+#: camel/camel-gpg-context.c:738
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:761
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:769
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
-#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
-#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr "Bertan behera utzita."
 
-#: camel/camel-gpg-context.c:771
+#: camel/camel-gpg-context.c:798
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ustekabeko erantzuna POP zerbitzaritik: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 #, fuzzy
 msgid "No data provided"
 msgstr "Ez da fitxategi-izenik eman."
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ezin da mezua enkriptatu: ez da hartzailerik zehaztu"
 
-#: camel/camel-gpg-context.c:1082
+#: camel/camel-gpg-context.c:1125
 #, fuzzy, c-format
 msgid ""
-"Failed to GPG %s message: %s\n"
+"Failed to GPG %s: %s\n"
 "\n"
 "%.*s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-gpg-context.c:1088
+#: camel/camel-gpg-context.c:1131
 #, fuzzy, c-format
-msgid "Failed to GPG %s message: %s\n"
+msgid "Failed to GPG %s: %s\n"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-gpg-context.c:1197
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Huts egin du mezua deskodetzean."
 
-#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
-#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
-#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Huts egin du mezua deskodetzean."
 
-#: camel/camel-gpg-context.c:1290
+#: camel/camel-gpg-context.c:1333
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8368,25 +8489,24 @@ msgstr "Ezin izan da '%s' blokeatu: protokolo-errorea blokeo-laguntzailearekin"
 msgid "Could not lock '%s'"
 msgstr "Ezin izan da '%s' blokeatu"
 
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:93 camel/camel-lock.c:112
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Ezin izan da blokeo-fitxategirik sortu %s(r)entzat: %s"
 
-#: camel/camel-lock.c:152
+#: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Denbora agortu zaizu %s(e)n blokeo-fitxategia hartzen saiatzean. Saiatu "
 "berriro geroago."
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Huts egin du fcntl(2) erabiliz blokeatzean: %s"
 
-#: camel/camel-lock.c:268
+#: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Huts egin du flock(2) erabiliz blokeatzean: %s"
@@ -8396,51 +8516,51 @@ msgstr "Huts egin du flock(2) erabiliz blokeatzean: %s"
 msgid "Could not check mail file %s: %s"
 msgstr "Ezin izan da %s posta-fitxategia egiaztatu: %s"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Ezin izan da %s posta-fitxategia ireki: %s"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Ezin izan da ireki aldi baterako %s posta-fitxategia: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:157
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Huts egin du mezua aldi baterako %s fitxategian gordetzean: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Ezin izan da kanalizaziorik sortu: %s"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Ezin izan da fork egin: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail programak huts egin du: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(Errore ezezaguna)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Errorea posta-fitxategia irakurtzean: %s"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Errorea aldi baterako posta-fitxategia idaztean: %s"
 
-#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Errorea aldi baterako posta-fitxategia kopiatzean: %s"
@@ -8459,27 +8579,27 @@ msgstr "Huts egin du desenkriptatzean: Ezezaguna"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Huts egin du desenkriptatzean: Ezezaguna"
 
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 #, fuzzy
 msgid "parse error"
 msgstr "Beste errore bat"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Ezin izan da %s kargatu: Moduluak kargatzea ez da onartzen sistema honetan."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Ezin izan da %s kargatu: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ezin izan da %s kargatu: Moduluak ez du hasieratze-koderik."
@@ -8537,11 +8657,11 @@ msgstr ""
 "Aukera honek zerbitzariarekin konektatuko zaitu CRAM-MD5 pasahitz segurua "
 "erabiliz, zerbitzariak onartzen badu."
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8549,41 +8669,119 @@ msgstr ""
 "Aukera honek zerbitzariarekin konektatuko zaitu DIGEST-MD5 pasahitz segurua "
 "erabiliz, zerbitzariak onartzen badu."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Zerbitzari-erronka luzeegia (>2048 zortzikote)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Zerbitzari-erronka baliogabea\n"
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr "Zerbitzari-erronkak \"Quality of Protection\" token baliogabea du\n"
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr "Zerbitzariaren erantzunak ez dauka baimen-daturik\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Zerbitzariaren erantzuneko baimen-datuak ez daude osorik\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "Zerbitzariaren erantzuna ez dator bat\n"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-gssapi.c:48
+msgid "GSSAPI"
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:50
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr ""
+"Aukera honek zerbitzariarekin konektatuko zaitu Kerberos 4 "
+"autentifikazioaren bidez."
+
+#: camel/camel-sasl-gssapi.c:148
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:153
+msgid "The provided target_name parameter was ill-formed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:156
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:160
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:165
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:169
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:180
+msgid "The consistency checks performed on the credential failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:183
+msgid "The referenced credentials have expired."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
+msgid "Bad authentication response from server."
+msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Onartzen ez den mota"
+
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Aukera honek zerbitzariarekin konektatuko zaitu Kerberos 4 "
 "autentifikazioaren bidez."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8592,11 +8790,6 @@ msgstr ""
 "Ezin izan du Kerberos ticket-a lortu:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
-
 #: camel/camel-sasl-login.c:32
 msgid "Login"
 msgstr "Saio-hasiera"
@@ -8647,7 +8840,7 @@ msgstr "POP Before SMTP auth using an unknown transport"
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP Before SMTP auth using a non-pop source"
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Adierazpen erregularraren konpilazioak huts egin du: %s: %s"
@@ -8667,37 +8860,37 @@ msgstr "'%s' URLak ostalari-osagaia behar du"
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLak bide-izenaren osagaia behar du"
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ebazten: %s"
 
-#: camel/camel-service.c:774 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Huts egin du izen-bilaketan: %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Ostalari-bilaketak huts egin du: %s: ez da ostalaria aurkitu"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 #, fuzzy
 msgid "Resolving address"
 msgstr "Ebazten: %s"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Ostalari-bilaketak huts egin du: %s: ez da ostalaria aurkitu"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
@@ -8710,12 +8903,12 @@ msgstr "Karpeta birtualen posta-hornitzailea"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Mezuak beste karpeta-multzo bateko kontsulta gisa irakurtzeko"
 
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:354 camel/camel-session.c:422
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ez dago hornitzailerik `%s' protokolorako"
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8724,179 +8917,179 @@ msgstr ""
 "Ezin izan da %s direktorioa sortu:\n"
 "%s"
 
-#: camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:171
 #, c-format
 msgid "Please enter your password for %s"
 msgstr "Idatzi %s(e)rako pasahitza"
 
-#: camel/camel-smime-context.c:203
+#: camel/camel-smime-context.c:201
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Idatzi ziurtagiri baten goitizena, sinatzeko erabiltzeko."
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "Ez dago \"%s\"(r)en sinadura-ziurtagiririk."
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Ez dago \"%s\"(r)en enkriptatze-ziurtagiririk."
 
-#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
+#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "Huts egin du \"%s\"(r)en ziurtagiria aurkitzean."
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr "Huts egin du handizkako algoritmo arrunta aurkitzean."
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 msgid "Failed to decode message."
 msgstr "Huts egin du mezua deskodetzean."
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ezin da karpeta hartu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ezin da karpeta sortu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 #, fuzzy
 msgid "Unable to decrypt certificate signature"
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Sinadura-fitxategia:"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 #, fuzzy
 msgid "Certificate has expired"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 #, fuzzy
 msgid "Error in CRL"
 msgstr "Errorea %s kargatzean"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 #, fuzzy
 msgid "Out of memory"
 msgstr "Bulegotik kanpo"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 #, fuzzy
 msgid "Unable to verify leaf signature"
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 #, fuzzy
 msgid "Certificate Revoked"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 #, fuzzy
 msgid "Invalid purpose"
 msgstr "Argumentu baliogabea"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8909,15 +9102,15 @@ msgstr ""
 "Hatz-marka:        %s\n"
 "Sinadura:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "ONA"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "TXARRA"
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, fuzzy, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8935,7 +9128,7 @@ msgstr ""
 "Hala ere onartu nahi duzu?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:690
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8950,35 +9143,35 @@ msgstr ""
 "\n"
 "Onartu nahi duzu?"
 
-#: camel/camel-tcp-stream-ssl.c:734
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:786
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:804
+#: camel/camel-tcp-stream-ssl.c:947
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:964
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Ezin izan da `%s' URLa analizatu"
@@ -8993,27 +9186,27 @@ msgstr "Errorea %s abiaraztean"
 msgid "No such message %s in %s"
 msgstr "%s mezurik ez dago %s(e)n"
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ezin da karpeta ezabatu: %s: eragiketa baliogabea"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ezin da karpeta ezabatu: %s: ez dago horrelako karpetarik"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ezin da karpetaren izena aldatu: %s: eragiketa baliogabea"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9021,13 +9214,13 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2611
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2614
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Zerbitzaria deskonektatu egin da ustekabean: %s"
@@ -9050,52 +9243,52 @@ msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "Zerbitzariaren erantzuna lasterregi amaitu da."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:655
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:691
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ustekabeko baiezko erantzuna IMAP zerbitzaritik: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:221
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:240
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ezin izan da %s(r)en laburpena kargatu"
 
-#: camel/providers/imap/camel-imap-folder.c:306
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "Karpeta deuseztatu egin da eta berriro sortu zerbitzarian."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:548
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Aldatutako mezuen bila eskaneatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:1872
+#: camel/providers/imap/camel-imap-folder.c:1873
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Huts egin du mezua berreskuratzean"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9104,24 +9297,24 @@ msgstr ""
 "Ezin da mezua hartu: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Ez dago horrelako mezurik"
 
-#: camel/providers/imap/camel-imap-folder.c:1931
-#: camel/providers/imap/camel-imap-folder.c:2527
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
 msgid "This message is not currently available"
 msgstr "Mezu hau orain ez dago erabilgarri "
 
-#: camel/providers/imap/camel-imap-folder.c:2191
-#: camel/providers/imap/camel-imap-folder.c:2261
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
 msgid "Fetching summary information for new messages"
 msgstr "Mezu berrien laburpen-informazioa bilatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:2565
+#: camel/providers/imap/camel-imap-folder.c:2567
 msgid "Could not find message body in FETCH response."
 msgstr "Ezin izan da mezuaren gorputza aurkitu FETCH erantzunean."
 
@@ -9151,7 +9344,7 @@ msgstr "Mezu berririk dagoen begiratzen"
 msgid "Check for new messages in all folders"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "Karpetak"
 
@@ -9181,7 +9374,7 @@ msgstr "IMAP zerbitzarietan posta irakurri eta gordetzeko."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Pasahitza"
 
@@ -9201,63 +9394,62 @@ msgstr "%s SMTP zerbitzaria"
 msgid "IMAP service for %s on %s"
 msgstr "%s zerbitzua %s(e)rako %s(e)n"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr "Konexioa etenda"
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea erabiltzaile-izena bidaltzean: %s"
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Eragiketa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentifikazioak huts egin du."
 
-#: camel/providers/imap/camel-imap-store.c:1082
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "%s IMAP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa"
 
-#: camel/providers/imap/camel-imap-store.c:1092
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s motako autentifikazioa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:1116
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en IMAP pasahitza"
 
-#: camel/providers/imap/camel-imap-store.c:1131
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Ez duzu idatzi pasahitza."
 
-#: camel/providers/imap/camel-imap-store.c:1160
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9268,24 +9460,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1462
-#: camel/providers/imap/camel-imap-store.c:1604
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1839
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Karpeta-izenak ezin du Itzulera karaktererik eduki."
 
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1851
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Karpeta gurasoak ez du azpikarpetak edukitzeko baimenik"
 
@@ -9362,8 +9554,8 @@ msgstr ""
 "Posta lokala irakurri eta gordetzeko mbox spool fitxategi estandarretan."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s gordetze-erroa ez da bide-izen absolutua"
@@ -9375,36 +9567,36 @@ msgstr "%s gordetze-erroa ez da direktorio erregularra"
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ezin da karpeta hartu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Biltegi lokalek ez dute sarrerako ontzirik"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s posta-fitxategi lokala"
 
-#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ezin izan zaio karpeta-izena aldatu %s --> %s: %s"
 
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Ezin izan da karpetaren `%s'laburpen-fitxategia ezabatu: %s"
 
-#: camel/providers/local/camel-local-store.c:394
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ezin izan da karpetaren `%s'indize-fitxategia ezabatu: %s"
@@ -9414,7 +9606,7 @@ msgstr "Ezin izan da karpetaren `%s'indize-fitxategia ezabatu: %s"
 msgid "Could not save summary: %s: %s"
 msgstr "Ezin izan da laburpena gorde: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:454
+#: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ezin zaio mezua gehitu laburpenari: arrazoi ezezaguna"
 
@@ -9427,14 +9619,14 @@ msgstr "Maildir mezua eranstea bertan behera utzi da"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ezin zaio mezua erantsi maildir karpetari: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr "Mezu-eduki baliogabea"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9446,14 +9638,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "`%s' karpeta ez dago."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:168
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9468,70 +9660,70 @@ msgid "`%s' is not a maildir directory."
 msgstr "`%s' ez da maildir direktorioa."
 
 #: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-maildir-store.c:205
 #: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr "ez da maildir direktorioa"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:282
-#: camel/providers/local/camel-spool-store.c:312
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ezin izan da `%s' karpeta eskaneatu: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:416
-#: camel/providers/local/camel-maildir-summary.c:545
+#: camel/providers/local/camel-maildir-summary.c:417
+#: camel/providers/local/camel-maildir-summary.c:548
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ezin da maildir direktorioaren bide-izena ireki: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Mezu berririk dagoen begiratzen"
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Mezu berrien bila eskaneatzen"
 
-#: camel/providers/local/camel-maildir-summary.c:729
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:583
-#: camel/providers/local/camel-mbox-summary.c:673
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Karpeta biltegiratzen"
 
-#: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ezin da karpeta-blokeoa sortu %s(e)n: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ezin da postontzia ireki: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "Posta eranstea bertan behera utzi da"
 
-#: camel/providers/local/camel-mbox-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ezin zaio mezua erantsi mbox fitxategiari: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:396
-#: camel/providers/local/camel-mbox-folder.c:404
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9540,11 +9732,11 @@ msgstr ""
 "Ezin da mezua hartu: %s %s karpetatik\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Mezu-eraikuntzak huts egin du: Postontzia hondatuta?"
 
@@ -9587,77 +9779,77 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' karpeta ez dago hutsik. Ez da ezabatu."
 
-#: camel/providers/local/camel-mbox-summary.c:350
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ezin izan da karpeta ireki: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:398
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Posta-analizatzailearen ezinbesteko errorea %2$s karpetako %1$ld posiziotik "
 "gertu"
 
-#: camel/providers/local/camel-mbox-summary.c:453
+#: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ezin da karpeta egiaztatu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:678
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ezin izan da fitxategia ireki: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-spool-summary.c:169
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ezin da aldi baterako postontzia ireki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-mbox-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Ezin izan da itxi %s iturburu-karpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:621
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Ezin izan da aldi baterako karpeta itxi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:716
-#: camel/providers/local/camel-mbox-summary.c:724
-#: camel/providers/local/camel-mbox-summary.c:913
-#: camel/providers/local/camel-mbox-summary.c:921
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Sinkronizatu arren, laburpena eta karpeta ez datoz bat"
 
-#: camel/providers/local/camel-mbox-summary.c:848
-#: camel/providers/local/camel-spool-summary.c:332
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:812
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:976
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Errorea aldi baterako postontzian idaztean: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:993
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Huts egin du aldi baterako postontzian idaztean: %s: %s"
@@ -9676,67 +9868,67 @@ msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' ez da direktorioa."
 
-#: camel/providers/local/camel-mh-summary.c:243
+#: camel/providers/local/camel-mh-summary.c:244
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ezin da MH direktorioaren bide-izena ireki: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spool-karpetei ezin zaie izena aldatu"
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "%s gordetze-erroa ez da direktorio erregularra"
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "`%s/%s' karpetarik ez dago."
 
-#: camel/providers/local/camel-spool-store.c:176
+#: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' ez da fitxategi erregularra."
 
-#: camel/providers/local/camel-spool-store.c:193
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr "%s spool-eko posta fitxategia"
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool-karpetei ezin zaie izena aldatu"
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-karpetei ezin zaie izena aldatu"
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-karpetak ezin dira ezabatu"
 
-#: camel/providers/local/camel-spool-summary.c:181
-#: camel/providers/local/camel-spool-summary.c:190
-#: camel/providers/local/camel-spool-summary.c:199
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Ezin izan da %s aldi baterako karpeta sinkronizatu: %s"
 
-#: camel/providers/local/camel-spool-summary.c:214
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Ezin izan da %s spool-karpeta sinkronizatu: %s"
 
-#: camel/providers/local/camel-spool-summary.c:244
-#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
 #: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
@@ -9818,42 +10010,42 @@ msgid "Retrieving POP summary"
 msgstr "POP laburpena berreskuratzen"
 
 #: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:427
-#: camel/providers/pop3/camel-pop3-folder.c:486
-#: camel/providers/pop3/camel-pop3-folder.c:503
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
 msgid "User cancelled"
 msgstr "Erabiltzaileak bertan behera utzi du"
 
-#: camel/providers/pop3/camel-pop3-folder.c:264
+#: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ezin da POP laburpena hartu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr "Ezabatutako mezuak betiko borratzen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:401
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ez dago %s uid-a duen mezurik"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:408
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP mezua berreskuratzen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:488
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Ezin da %s mezua hartu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Arrazoi ezezaguna"
 
@@ -9870,7 +10062,7 @@ msgstr "Utzi mezuak zerbitzarian"
 msgid "Delete after %s day(s)"
 msgstr "Ezabatu %s egunen ondoren"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -9897,27 +10089,27 @@ msgstr ""
 "erabiliz APOP protokoloaren bidez. Beharbada honek ez du erabiltzaile "
 "guztiekin funtzionatuko zerbitzariak onartzen duela adierazten badu ere."
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea erabiltzaile-izena bidaltzean: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Ezin izan da POP zerbitzariarekin konektatu %s(e)n."
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9926,28 +10118,28 @@ msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Ez du eskatutako autentifikazio-mekanismoa onartzen."
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' saio-hasierak huts egin du: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Ezin izan da KPOP zerbitzarian autentifikatu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en POP pasahitza"
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9956,13 +10148,13 @@ msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea pasahitza bidaltzean: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:614
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "`%s' karpeta ez dago."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9972,50 +10164,50 @@ msgid ""
 "system."
 msgstr "Sistema lokalean \"sendmail\" programara pasatuz posta banatzeko."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Ezin izan da hartzaileen zerrenda analizatu"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Ezin izan da sendmail-erako kanalizaziorik sortu: %s: posta ez da bidali"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Ezin izan da sendmail-en fork-a egin: %s: posta ez da bidali"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Ezin izan da mezua bidali: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail %s seinalearekin irten da: posta ez da bidali."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Ezin izan da %s exekutatu: posta ez da bidali."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail %d egoerarekin irten da: posta ez da bidali."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta-banaketa sendmail programaren bidez"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10023,142 +10215,142 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTP erabiliz urruneko mailhub batekin konektatuta posta banatzeko.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaxi-errorea; komandoa ezezaguna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintaxi-errorea parametroetan edo argumentuetan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Komandoa inplementatu gabe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Komando-parametroa inplementatu gabe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Sistema-egoera, edo sistema-laguntzaren erantzuna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Laguntza-mezua"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Zerbitzua prest"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Zerbitzua transmisio-kanala ixten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Zerbitzua ez dago erabilgarri; transmisio kanala ixten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Eskatutako posta-ekintza ondo; eginda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr "Erabiltzailea ez da lokala;<forward-path>-era birbidaliko da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Ez da egin eskatutako posta-ekintza: postontzia ez dago erabilgarri"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Ez da egin eskatutako ekintza: postontzia ez dago erabilgarri"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Eskatutako ekintza abortatu egin da: errorea prozesatzean"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr "Erabiltzailea ez da lokala; proba egin <forward-path>-ekin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Ez da egin eskatutako ekintza: sistema-biltegia ez da nahikoa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "Eskatutako posta-ekintza abortatu egin da: biltegi-esleipena gaindituta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Ez da egin eskatutako ekintza: postontzi-izena ez da onartu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Hasi posta-sarrera; bukatu <CRLF>.<CRLF>-rekin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "Transakzioak huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "Pasahitz-trantsizioa behar da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Autentifikazio-mekanismoa ahulegia da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Eskatutako autentifikazio-mekanismoak beharrezkoa du enkriptatzea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Aldi baterako autentifikazioak huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Autentifikazioa behar da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 #, fuzzy
 msgid "Welcome response error"
 msgstr "QUIT erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea erabiltzaile-izena bidaltzean: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:342
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Ez dirudi mezua behar bezala osatuta dagoenik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "DATA erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "%s SMTP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en SMTP pasahitza"
@@ -10188,11 +10380,11 @@ msgstr "SMTP posta-banaketa %s bidez"
 msgid "Cannot send message: sender address not valid."
 msgstr "Ezin da mezua bidali: bidaltzailearen helbidea ez da baliozkoa."
 
-#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Mezua bidaltzen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
 
@@ -10200,62 +10392,62 @@ msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ezin da mezua bidali: erabiltzaile bat edo gehiago baliogabeak dira"
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "SMTP Agurra"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "RSET eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Errorea SASL autentifikazio-objektua sortzean."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "AUTH eskaerak huts egin du."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCTP TO eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
@@ -10263,78 +10455,78 @@ msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 msgid "DATA response error"
 msgstr "DATA erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA bidalketa denboraz kanpo: mezuaren amaiera: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr "DATA amaitze-erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr "RSET erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr "QUIT erantzunaren errorea"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:102
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:113
+#: composer/e-msg-composer-attachment-bar.c:108
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "eranskina"
 
-#: composer/e-msg-composer-attachment-bar.c:520
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr "Kendu hautatutako elementuak eranskin-zerrendatik"
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Gehitu eranskina..."
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Erantsi fitxategi bat mezuari"
 
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Ezin da %s fitxategia erantsi: %s"
 
-#: composer/e-msg-composer-attachment.c:177
+#: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Ezin da %s fitxategia erantsi: ez da fitxategi erregularra"
@@ -10352,11 +10544,15 @@ msgid "MIME type:"
 msgstr "MIME mota:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:163
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr "Proposatu eranskina automatikoki bistaratzea"
 
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr "Egin klik hemen helbide-liburura joateko"
 
@@ -10367,45 +10563,45 @@ msgstr "Egin klik hemen helbide-liburura joateko"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:400
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Erantzun honi:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Nork:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Gaia:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Nori: "
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Idatzi mezuaren hartzaileak"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:436
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Idatzi mezuaren kopia jasoko dutenen helbideak"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:440
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10416,27 +10612,28 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "Azalpenik ez"
 
-#: composer/e-msg-composer-select-file.c:275
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
 msgstr "Erantsi fitxategi bat"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Ezin izan da PGP sinadura-testuingurua sortu."
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10445,34 +10642,30 @@ msgstr ""
 "Errorea %s fitxategia irakurtzean:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "Kontuz!"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Fitxategia badago; gainidatzi?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errorea fitxategia gordetzean: %s"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errorea fitxategia kargatzean: %s"
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errorea fitxategia atzitzean: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Ezin da mezua editoretik berreskuratu"
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10481,7 +10674,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10490,7 +10683,16 @@ msgstr ""
 "Ezin da fitxategia trunkatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1285
+#, fuzzy, c-format
+msgid ""
+"Unable to copy file descriptor: %s\n"
+"%s"
+msgstr ""
+"Ezin da fitxategian bilatu: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10499,7 +10701,7 @@ msgstr ""
 "Errorea mezua automatikoki gordetzean: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10507,7 +10709,7 @@ msgstr ""
 "Aurreko saioko fitxategi gorde gabeak aurkitu ditu Ximian Evolution-ek.\n"
 "Berreskuratzen saiatu nahi duzu?"
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10518,28 +10720,33 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: composer/e-msg-composer.c:1536
+#: composer/e-msg-composer.c:1555
+msgid "_Discard Changes"
+msgstr ""
+
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Kontuz: mezua aldatu egin da"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Ireki fitxategia"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Signature:"
 msgstr "Gorde sinadura"
 
-#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "Prestatu mezua"
 
-#: composer/e-msg-composer.c:2796
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10547,7 +10754,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da helbidea hautatzeko kontrola aktibatu."
 
-#: composer/e-msg-composer.c:2822
+#: composer/e-msg-composer.c:2931
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10558,7 +10765,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10566,25 +10773,12 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/e-msg-composer.c:3858
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:393
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"Ezin izan da mezuak prestatzeko leihoa sortu, oraindik ez \n"
-"duzulako identitaterik konfiguratu posta-osagaian."
-
-#: composer/evolution-composer.c:408
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "Ezin da Evolution-en mezu-prestatzailea hasieratu."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Evolution-en talde-lanerako tresna"
@@ -10633,8 +10827,111 @@ msgstr "gaiak hau dauka"
 msgid "Subject does not contain"
 msgstr "gaiak ez dauka hau"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
-#: mail/mail-display.c:192
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:4
+#, fuzzy
+msgid "<b>Out of Office Message:</b>"
+msgstr "Bulegotik kanpo"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "Egoera:"
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:12
+#, fuzzy
+msgid "Out of Office Assistant"
+msgstr "Bulegotik kanpo"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "Bandera-egoera"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "Mezuak jaso"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "Mezuak bidali"
+
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:9
+#, fuzzy
+msgid "Read Receipts"
+msgstr "Hartzailea"
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
+#: e-util/e-component-listener.c:128
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10642,213 +10939,239 @@ msgstr ""
 "Izen hori duen fitxategia badago lehendik.\n"
 "Gainidatzi?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Fitxategia gainidatzi?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Gogoratu pasahitz hau"
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Gogoratu pasahitz hau saio hau amaitu arte"
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr "Sinkronizatu erregistro pribatuak:"
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 msgid "Sync Categories:"
 msgstr "Sinkronizatu kategoriak:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:171 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %Y/%m/%d %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:176 e-util/e-time-utils.c:375
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %Y/%m/%d %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:181
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a, %Y/%m/%d %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:186
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %Y/%m/%d %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:197
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:201
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:206
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:216
 msgid "%m/%d/%Y %I %p"
 msgstr "%Y/%m/%d %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:221
 msgid "%m/%d/%Y %H"
 msgstr "%Y/%m/%d %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:325 e-util/e-time-utils.c:424
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:329 e-util/e-time-utils.c:416
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
+#: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
+#: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:342
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:181
-msgid "seconds"
-msgstr "segundo "
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "segundo bat"
 
-#: filter/filter-datespec.c:71
-msgid "minute"
-msgstr "minutu "
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d segundo"
 
-#: filter/filter-datespec.c:72
-msgid "hour"
-msgstr "ordu "
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "minutu bat"
 
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "aste "
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d minutu"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "aste "
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
+msgstr "ordubete"
 
-#: filter/filter-datespec.c:75
-msgid "month"
-msgstr "hilabete "
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d ordu"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "egun bat"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr "lehenago"
+
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "aste bat"
+
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d aste"
+
+#: filter/filter-datespec.c:70
+#, fuzzy
+msgid "1 month ago"
 msgstr "hilabete "
 
-#: filter/filter-datespec.c:76
-msgid "year"
-msgstr "urte "
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr "lehenago"
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "urte "
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
+
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr "lehenago"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 #, fuzzy
 msgid "You must choose a date."
 msgstr "Data aukeratzea ahaztu zaizu."
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr "<egin klik hemen data hautatzeko>"
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "orain"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:279
+#: filter/filter-datespec.c:285
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%a, %Y %b %d"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
-#, fuzzy, c-format
-msgid "%d %s ago"
-msgstr "lehenago"
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Hautatu ordua"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Iragazteko arauak"
 
-#: filter/filter-file.c:178
+#: filter/filter-file.c:166
 #, fuzzy
-msgid "You must specify a file name"
+msgid "You must specify a file name."
 msgstr "Zehaztu fitxategi-izena:"
 
-#: filter/filter-file.c:190
+#: filter/filter-file.c:184
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "`%s' spool-a ez dago edo ez da fitxategi erregularra"
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 #, fuzzy
 msgid "Choose a file"
 msgstr "Aukeratu ekintza bat:"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "Orduan"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "Gehitu ekintza"
-
-#: filter/filter-folder.c:149
+#: filter/filter-folder.c:155
 #, fuzzy
-msgid "You must specify a folder.\n"
+msgid "You must specify a folder."
 msgstr "Zehaztu fitxategi-izena:"
 
-#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10857,79 +11180,77 @@ msgstr ""
 "Errorea '%s' adierazpen erregularrean:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:62
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
 msgid "Important"
 msgstr "Garrantzitsua"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133
+#: filter/filter-label.c:122 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1281
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124
+#: filter/filter-label.c:124 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1283
 #, fuzzy
 msgid "Later"
 msgstr "geroago"
 
-#: filter/filter-part.c:545 shell/evolution-test-component.c:49
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 msgid "Test"
 msgstr "Proba"
 
-#: filter/filter-rule.c:223
+#: filter/filter-rule.c:219
 msgid "You must name this filter."
 msgstr "Iragazkiari izena eman behar diozu."
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Arau-izena: "
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "Izengabea"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Baldin eta"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "Exekutatu ekintzak"
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "irizpide guztiak betetzen badira"
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "irizpideren bat betetzen bada"
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "Gehitu irizpidea"
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "sarrerakoa"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "irteerakoa"
 
@@ -10981,7 +11302,7 @@ msgstr ""
 "Mezuaren data zuk hemen zehazten duzun orduarekin\n"
 "konparatuko da."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Karpeta birtualak"
 
@@ -10993,6 +11314,14 @@ msgstr "uneko orduarekiko erlatiboa den ordua"
 msgid "ago"
 msgstr "lehenago"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "hilabete "
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "segundo "
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "zehaztutako karpetak bakarrik"
@@ -11010,6 +11339,10 @@ msgstr "zuk zehaztutako ordua"
 msgid "vFolder Sources"
 msgstr "Karpeta birtualen iturburuak"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "aste "
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "urruneko karpeta aktibo guztiekin"
@@ -11022,6 +11355,10 @@ msgstr "karpeta lokal eta urruneko karpeta aktibo guztiekin"
 msgid "with all local folders"
 msgstr "karpeta lokal guztiekin"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "urte "
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11150,7 +11487,7 @@ msgstr "ez da"
 msgid "is not Flagged"
 msgstr "ez da Banderaduna"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
@@ -11181,7 +11518,7 @@ msgstr "Exekutatu shell komandoa"
 msgid "Play Sound"
 msgstr "Jo soinua:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr "Irakurrita"
 
@@ -11212,12 +11549,12 @@ msgstr "hau baino handiagoa da"
 msgid "returns less than"
 msgstr "hau baino txikiagoa da"
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuazioa"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Bidaltzailea"
 
@@ -11254,8 +11591,9 @@ msgstr "honela hasten da"
 msgid "Stop Processing"
 msgstr "Gelditu prozesatzea"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Gaia"
 
@@ -11264,68 +11602,84 @@ msgstr "Gaia"
 msgid "Unset Status"
 msgstr "Ezarri egoera"
 
-#: filter/rule-editor.c:180
-msgid "Rules"
-msgstr "Arauak"
-
-#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
 #, c-format
-msgid "Rule name '%s' is not unique, choose another"
+msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:170
+msgid "Rules"
+msgstr "Arauak"
+
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Gehitu araua"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "Editatu araua"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "Arau-izena: "
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr "Puntuazio-arauak"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "Karpeta birtualari izena eman behar diozu."
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr "Gutxienez karpeta bat zehaztu behar duzu iturburu gisa."
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "Karpeta birtualen iturburuak"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Elm posta zaharra inportatzen ari da Evolution"
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr "Inportatzen..."
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr "Itxaron"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr "%s inportatzen %s gisa."
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, c-format
 msgid "Scanning %s"
 msgstr "%s eskaneatzen"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:353
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
 msgstr "Posta"
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11333,7 +11687,7 @@ msgstr ""
 "Evolution-ek Elm posta-fitxategiak aurkitu ditu\n"
 "Evolution-era inportatu nahi dituzu?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11345,12 +11699,12 @@ msgstr ""
 "Evolution-ek GnomeCard fitxategiak aurkitu ditu.\n"
 "Evolution-era inportatu nahi dituzu?"
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Lehentasuna: %s"
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11365,7 +11719,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11373,7 +11727,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11382,39 +11736,41 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr "Netscape-ko datu zaharrak inportatzen ari da Evolution"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
-#: shell/e-local-storage.c:183
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Zakarrontzia"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "%s posta-fitxategi lokala"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr "Direktorioa eskaneatzen"
 
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Inportatzen hasten"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editatu iragazkiak"
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11422,11 +11778,11 @@ msgstr ""
 "Evolution-ek Netscape posta-fitxategiak aurkitu ditu.\n"
 "Evolution-era inportatu nahi dituzu?"
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr "Pine-ko datu zaharrak inportatzen ari da Evolution"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -11434,136 +11790,129 @@ msgstr ""
 "Evolution-ek Pine posta-fitxategiak aurkitu ditu.\n"
 "Evolution-era inportatu nahi dituzu?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 #, fuzzy
 msgid "Composer Preferences"
 msgstr "Egutegi-hobespenak"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Evolution-en mezu-prestatzailerako fabrika."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Evolution-en Zereginen kontrolerako fabrika."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Evolution-en mezu-prestatzailerako fabrika."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Evolution-en mezu-prestatzailerako fabrika."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 #, fuzzy
 msgid "Configure the fonts used by Evolution here"
 msgstr "Evolution-en mezu-prestatzailerako fabrika."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
 msgid "Configure your email accounts here"
 msgstr "Sortu edo editatu posta-kontuak eta bestelako hobespenak"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Posta maneiatzeko Evolution-en osagaia."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution "
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Evolution mail composer."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
 msgstr "Evolution-en mezu-prestatzailea."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Evolution-en postaren laneko laburpenaren osagaia."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution-en mezu-prestatzailea."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Posta-karpetak bistaratzeko Evolution-en osagaia."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Posta konfiguratzeko interfazea"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Posta-karpeten fabrikarako Evolution-en osagaia."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Posta-karpetak bistaratzeko Evolution-en osagaia."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Evolution-en mezu-prestatzailerako fabrika."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "Posta-laburpenaren osagairako fabrika."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution-en postaren laneko laburpenaren osagaia."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
 msgid "Font Preferences"
 msgstr "Egutegi-hobespenak"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Kontuak"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Egutegi-hobespenak"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr "Posta konfiguratzeko interfazea"
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Posta duen karpeta"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "Publikoa"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Posta duen karpeta"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Zakarrontzi birtualak"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Zakarrontzi birtualaren karpeta"
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Karpeta honek ezin du mezurik eduki."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Propietateak..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Aldatu karpeta honen propietateak"
 
-#: mail/component-factory.c:805
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11571,285 +11920,283 @@ msgstr ""
 "Posta-ezarpen batzuk hondatuta daudela ematen du, begira ezazu dena ondo "
 "dagoen."
 
-#: mail/component-factory.c:970
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Ez duzu ezarri posta garraiatzeko metodorik"
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:998
-#, fuzzy
-msgid "Warning: Unsent Messages"
-msgstr "Kontuz: mezua aldatu egin da"
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_Posta-mezua"
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Prestatu mezua"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Mezu berria"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "Aurreko mezua"
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Posta-mezu berria"
 
-#: mail/component-factory.c:1078
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Ezin da Evolution-en posta-osagaia hasieratu."
-
-#: mail/component-factory.c:1087
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Ezin da Evolution-en posta konfiguratzeko osagaia hasieratu."
-
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Ezin da Evolution-en karpeta-informazioaren osagaia hasieratu."
-
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
 #, fuzzy
 msgid "Connecting..."
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Ezin da biltegia shell-arekin erregistratu"
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" - propietateak"
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Propietateak"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d berri"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr "%d ezkutu"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr "%d ikusgarri"
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr "%d hautatuta"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d bidali gabe"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "%d bidali"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "%d guztira"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sortu _karpeta birtuala mezutik"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "_Gaiaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "_Hartzailearen araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "G_aiaren araberako iragazkia"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Jarrait_u..."
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1771
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Bandera o_satuta"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Garbitu ban_dera"
 
 #. separator here?
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markatu ez-garra_ntzitsu gisa"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Desezabatu"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Gehitu bidaltzailea _helbide-liburuan"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplikatu iragazkiak"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Posta-zerrendaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Posta-zerrendaren araberako iragazkia (%s)"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Posta-zerrendaren araberako karpeta birtuala (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Lehenetsi"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Karpeta-informazioa hartzen"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "mbox Evolution-era inportatzeko fabrika"
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution-en mezu-prestatzailea."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "mbox fitxategiak Evolution-era inportatzen ditu"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution-en mezu-prestatzailea."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Outlook Express 4ko mezuak Evolution-era inportatzeko fabrika"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Outlook Express 4ko fitxategiak inportatzen ditu Evolution-era"
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution-en mezu-prestatzailea."
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolution-en mezu-prestatzailea."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -11886,100 +12233,100 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr "Ez duzu eman eskatu zaizun informazio guztia."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:159
+#: mail/mail-account-editor.c:146
 msgid "Evolution Account Editor"
 msgstr "Evolution-en kontu-editorea"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Ostalaria:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_Erabiltzaile-izena:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_Bide-izena:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Ezin dituzu izen bereko bi kontu izan."
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Ez ezabatu"
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "Ziur zaude kontua ezabatu nahi duzula?"
-
-#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr "Desgaitu"
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr "Gaitu"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
+#, fuzzy
+msgid "[Default]"
+msgstr "Lehenetsi"
+
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr "Gaituta"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Kontu-izena:"
 
-#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Mezu-hartzailea: %s"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Gaia: %s"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Mezu-bidaltzailea: %s"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s posta-zerrenda"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr "Gehitu iragazkiaren araua"
 
-#: mail/mail-autofilter.c:376
+#: mail/mail-autofilter.c:372
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11991,7 +12338,12 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-callbacks.c:154
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Ez erakutsi mezu hau berriro."
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -12003,7 +12355,16 @@ msgstr ""
 "jaso edo prestatu ahal izateko.\n"
 "Orain konfiguratu nahi duzu?"
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:211
+#, fuzzy
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Identitatea konfiguratu behar duzu\n"
+"mezua idatzi ahal izateko."
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12011,7 +12372,7 @@ msgstr ""
 "Identitatea konfiguratu behar duzu\n"
 "mezua idatzi ahal izateko."
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12020,7 +12381,7 @@ msgstr ""
 "mezua idatzi ahal izateko."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:254
 #, fuzzy
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
@@ -12029,11 +12390,11 @@ msgstr ""
 "HTML formatuko mezua bidaltzera zoaz, baina hartzaile hauek ez dute HTML "
 "formatuko mezurik jaso nahi:\n"
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Hala ere bidali nahi duzu?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12041,7 +12402,7 @@ msgstr ""
 "Mezu honek ez du gairik.\n"
 "Ziur zaude bidali nahi duzula?"
 
-#: mail/mail-callbacks.c:356
+#: mail/mail-callbacks.c:313
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -12049,11 +12410,11 @@ msgstr ""
 "Mezua bidali behar diozun kontaktu-zerrenda helbidea ezkutuan edukitzeko "
 "konfiguratuta dagoenez, Bcc hartzaileak bakarrik izango ditu mezuak."
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "Mezu honek Bcc hartzaileak bakarrik ditu."
 
-#: mail/mail-callbacks.c:364
+#: mail/mail-callbacks.c:322
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -12063,11 +12424,11 @@ msgstr ""
 "goiburukoa gehituz.\n"
 "Hala ere bidali nahi duzu?"
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Hartzaileak zehaztu behar dituzu mezua bidaltzeko."
 
-#: mail/mail-callbacks.c:777
+#: mail/mail-callbacks.c:722
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -12075,30 +12436,30 @@ msgstr ""
 "Ezin da kontu honetako zirriborroen karpeta ireki.\n"
 "Zirriborroen karpeta lehenetsia erabili nahi duzu?"
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "bidaltzaile ezezaguna"
 
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 "Jatorrizko mezua:\n"
 "data: %a, %Y-%m-%d %H:%M, egilea: %%s"
 
-#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "Eraman mezua(k) hona"
 
-#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Kopiatu mezua(k) hemen"
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ziur zaude %d mezuak editatu nahi dituzula?"
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12106,7 +12467,7 @@ msgstr ""
 "Zirriborroen karpetan gordetako mezuak bakarrik\n"
 "edita ditzakezu."
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12114,43 +12475,46 @@ msgstr ""
 "Bidalitako mezuen karpetako mezuak bakarrik\n"
 "bidal ditzakezu berriro."
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Ez duzu mezurik hautatu"
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "Fitxategia gainidatzi?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Ezin da mezua hartu: %s\n"
+"  %s"
 
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s badago lehendik\n"
+"Gainidatzi nahi duzu?"
+
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Gorde mezua honela..."
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Gorde mezuak honela..."
 
-#: mail/mail-callbacks.c:2655
-msgid "Go to next folder with unread messages?"
-msgstr "Irakurri gabeko mezuak dituen hurrengo karpetara joan?"
-
-#: mail/mail-callbacks.c:2662
-msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-"Karpeta honetan ez dago mezu gehiago.\n"
-"Hurrengo karpetara joan nahi duzu?"
-
-#: mail/mail-callbacks.c:2905
+#: mail/mail-callbacks.c:2687
+#, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12159,7 +12523,7 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12168,64 +12532,64 @@ msgstr ""
 "Errorea iragazki-informazioa kargatzean:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Iragazkiak"
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d orria"
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
-#: mail/mail-callbacks.c:3156
-msgid "US-Letter"
-msgstr "US-Letter"
-
-#: mail/mail-callbacks.c:3197
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Huts egin du mezua inprimatzean"
 
-#: mail/mail-callbacks.c:3387
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ziur zaude %d mezuak leiho banatan ireki nahi dituzula?"
 
-#: mail/mail-composer-prefs.c:223
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+#, fuzzy
+msgid "Unnamed"
+msgstr "Kontaktu izengabea"
 
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
+#: mail/mail-composer-prefs.c:335
 #, fuzzy
-msgid " [script]"
-msgstr "Azalpenik ez"
+msgid "You must specify a valid script name."
+msgstr "Zehaztu fitxategi-izena:"
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
-msgstr ""
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+#, fuzzy
+msgid "[script]"
+msgstr "Azalpenik ez"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
+#: mail/mail-composer-prefs.c:864
 #, fuzzy
-msgid "Unnamed"
-msgstr "Kontaktu izengabea"
+msgid "Language(s)"
+msgstr "Hizkuntza"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
 #, fuzzy
 msgid "Add script signature"
 msgstr "Gehitu irizpidea"
 
-#: mail/mail-composer-prefs.c:876
+#: mail/mail-composer-prefs.c:926
 #, fuzzy
-msgid "Add Signature"
-msgstr "Gorde sinadura"
+msgid "Signature(s)"
+msgstr "_Sinadura-fitxategia:"
+
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Identitatea"
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:382
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -12236,7 +12600,12 @@ msgstr ""
 "eremuak bete gabe utz ditzakezu.\n"
 "Betetzen badituzu, datu horiek zuk bidaltzen dituzun mezuetan agertuko dira."
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "Mezuak jaso"
+
+#: mail/mail-config-druid.c:390
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -12246,11 +12615,16 @@ msgstr ""
 "bazaude, galdetu sistemaren\n"
 "administratzaileari edo Interneteko zerbitzu-hornitzaileari."
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Hautatu ondorengo aukeretako bat"
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Mezuak bidali"
+
+#: mail/mail-config-druid.c:402
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -12260,7 +12634,11 @@ msgstr ""
 "bazaude, galdetu\n"
 "sistema-administratzaileari edo Interneteko zerbitzu-hornitzaileari."
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Kontuaren kudeaketa"
+
+#: mail/mail-config-druid.c:409
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -12277,154 +12655,137 @@ msgstr ""
 "Bistaratzeko \n"
 "bakarrik erabiliko da kontu-izen hori."
 
-#. set window title
-#: mail/mail-config-druid.c:637
-msgid "Evolution Account Assistant"
-msgstr "Evolution-eko kontuaren morroia"
-
-#: mail/mail-config.c:622
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "Kontua"
-
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Zerbitzua egiaztatzen"
 
-#: mail/mail-config.c:2394 mail/mail-config.c:2398
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Begiratu zein mota onartzen diren"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL ez da onartzen evolution-en bertsio honetan)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
-#: mail/mail-config.glade.h:5
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr ""
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Account Editor"
 msgstr "%d kontua"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Kontuaren informazioa"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Kontuaren kudeaketa"
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Gehitu irizpidea"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Gorde sinadura"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Beti _sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Beti bidali _Bcc kopia honi:"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Beti bidali Cc kopia honi:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "Erantsi fitxategi bat mezuari"
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Eranskina"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentifikazioa"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Karaktere-joko ezezaguna: %s"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "C_olors"
 msgstr "_Itxi"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Mezu berririk dagoen begiratzen"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Gaurko zereginen kolorea"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Mezuak prestatzen"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
+#, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
 "Zorionak, osatu duzu zure posta-konfigurazioa.\n"
 "\n"
@@ -12433,301 +12794,298 @@ msgstr ""
 "\n"
 "Egin klik \"Amaitu\" botoian, ezarpenak gordetzeko."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Le_henetsi"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Lehentasun lehenetsia:"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Karaktere-kodeketa lehenetsia: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Mezuak bilatzen"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr "ID digitalak..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Ezin da mezua ireki"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Eginda"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Z_irriborroen karpeta:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Gaitu"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Emacs"
 msgstr "Ekialdea"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Helb. el.ak hau dauka"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "_Helbide elektronikoa:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Hustu zakarrontziko karpetak irtetean"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Evolution-eko kontuaren morroia"
+
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Exekutatu komandoa..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "honela amaitzen da"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propietateak"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "Hartu ID digitala..."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Aipuak nabarmentzeko erabili "
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Identitatea"
-
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Barnean"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Gorde eta itxi"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Kargatu iru_diak"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Posta-konfigurazioa"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Postontziaren kokalekua"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Mezuaren goiburukoa"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "_Mezu-bistaratzea"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "mezuak hau dauka"
+
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronesia"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Mezu berrien jakinarazpena"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "On Screen fonts"
-msgstr ""
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Aukerako informazioa"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "E_rakundea:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/_GPG gakoaren IDa:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Aukeratu kolorea"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Inprimatu hautatutako kontaktuak"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quote original message"
 msgstr "Ezin da mezua ireki"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Aipamen gisa"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "_Gogoratu pasahitz hau"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Erantzun honi:"
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Jasotzeko aukerak"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Gogoratu pasahitz hau"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Beharrezko informazioa"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Lehenespenak"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Segurtasuna"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME segurua (S/MIME)"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "_Bidalitako mezuen karpeta:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Bidalitako mezuak eta zirriborroak"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Zerbitzariak _autentifikazioa behar du"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Zerbitzariaren konfigurazioa"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "_Zerbitzari-mota: "
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Lasterbideak"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Zehaztu fitxategi-izena:"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr ""
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
@@ -12762,10 +13120,11 @@ msgid "V_ariable-width:"
 msgstr "Aldakorra"
 
 #: mail/mail-config.glade.h:129
+#, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 "Ongi etorri Evolution-en posta konfiguratzeko morroira.\n"
 "\n"
@@ -12841,119 +13200,124 @@ msgid "_Enable"
 msgstr "Gaitu"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Birbidali honela"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Izen osoa:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML postan"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitatea"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_Kargatu irudiak bidaltzailea helbide-liburuan badago"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Lehenetsi _kontu hau"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Markatu mezuak irakurritako gisa"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Inoiz ez kargatu irudirik saretik kanpo"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Jo soinua mezu berriak iristean"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Abisatu HTML formaturik nahi ez dutenei HTML mezuak bidali aurretik"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Abisatu mezuak gairik _gabe bidali aurretik"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Erantzun denei"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Script:"
 msgstr "Se_gurtasuna"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Erakutsi ordua honela"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Sinadura-fitxategia:"
 
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Sand Point"
+
 #: mail/mail-config.glade.h:175
 #, fuzzy
-msgid "_Use secure connection (SSL):"
-msgstr "Erabili konexio segurua (_SSL)"
+msgid "_Terminal Font:"
+msgstr "Jatorrizko kontaktua:"
 
 #: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Variable-width:"
-msgstr "Aldakorra"
+msgid "_Use secure connection (SSL):"
+msgstr "Erabili konexio segurua (_SSL)"
 
 #: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "_dagoen, maiztasun honekin"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "color"
 msgstr "kolorea"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "azalpena"
 
@@ -12977,186 +13341,190 @@ msgstr "Ezin izan da S/MIME gutun-azal testuingurua sortu."
 msgid "Could not create a S/MIME decode context."
 msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Izen hori duen fitxategia badago lehendik.\n"
+"Gainidatzi?"
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Gorde eranskina"
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Ezin izan da aldi baterako `%s' fitxategia sortu: %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Gorde eranskina"
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Ikusi barnean"
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Ireki honekin: %s..."
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ikusi barnean (%s bidez)"
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Ezkutatu"
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Kanpoko ikustailea"
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
 #, fuzzy
 msgid "Downloading images"
 msgstr "Kargatu iru_diak"
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Mezuaren edukia kargatzen"
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
 #, fuzzy
 msgid "Overdue:"
 msgstr "A_tzeratutako zereginak:"
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Ireki esteka arakatzailean"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Kopiatu estekaren helbidea"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Gorde esteka honela (FIXME) "
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Gorde irudia honela..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "%s eskaneatzen"
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "%s eranskina"
 
-#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
-#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: mail/mail-format.c:783 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Helbide okerra"
 
-#: mail/mail-format.c:913 mail/message-list.etspec.h:7
-#: mail/message-tags.glade.h:3
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Nork"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Erantzun honi"
 
-#: mail/mail-format.c:922 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Nori"
 
-#: mail/mail-format.c:927
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:932
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:963
-#, fuzzy
-msgid "Mailer"
-msgstr "Posta"
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Mezu honek sinadura digitala du.Informazio gehiago ikusteko, egin klik "
 "giltzarrapoaren ikonoan."
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Ezin izan da PGP egiaztapen-testuingurua sortu."
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
 
-#: mail/mail-format.c:1892
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Mezu honek sinadura digitala dauka, baina ezin izan da frogatu egiazkoa dela."
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP gunerako erakuslea (%s)"
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "(%s) fitxategi lokalerako erakuslea"
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "(%s)urruneko datuetarako erakuslea"
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Kanpoko goputz-zatia gaizki osatuta dago."
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Karpeta lokalak"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Karpeta birkonfiguratzen"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:748
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13165,12 +13533,12 @@ msgstr ""
 "Ezin da gorde karpetaren metainformazioa; beharbada karpeta\n"
 "hau ezingo duzu gehiago ireki: %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ezin da karpetaren metainformazioa gorde %s(e)n: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ezin dira %s karpetaren metadatuak ezabatu: %s"
@@ -13180,7 +13548,7 @@ msgstr "Ezin dira %s karpetaren metadatuak ezabatu: %s"
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" karpeta\"%s\" formatura aldatzen"
 
-#: mail/mail-local.c:1351
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13188,12 +13556,12 @@ msgstr ""
 "Aurrerantzean ezin baduzu postontzi hau ireki,\n"
 "eskuz konpondu beharko duzu."
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Birkonfiguratu /%s"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr "Ezin duzu aldatu lokala ez den karpeta baten formatua."
 
@@ -13215,108 +13583,108 @@ msgstr ""
 "Errorea eragiketa egitean:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Lanean"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Karpeta iragazten"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Mezuak bilatzen"
 
-#: mail/mail-ops.c:553 mail/mail-ops.c:582
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
 msgstr "Hala ere, mezua ongi bidali da."
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" bidaltzen"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
 
-#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
 msgid "Complete."
 msgstr "Osatuta."
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Mezua karpetan gordetzen"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "%s biltegia irekitzen"
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Karpeta freskatzen"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "Karpeta betiko borratzen"
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s mezua berreskuratzen"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d mezu berreskuratzen"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d mezu gordetzen"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13325,7 +13693,7 @@ msgstr ""
 "Ezin da sortu irteerako fitxategia: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13334,11 +13702,11 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13347,54 +13715,54 @@ msgstr ""
 "Ezin da irteerako fitxategia sortu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s(e)tik deskonektatzen"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_Bilatu"
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Mezu izengabea)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Mezu izengabea"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Mezu hutsa"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Bilatu mezuan"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "Bilatu"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Maiuskula/minuskula"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "Bilatu aurrerantz"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Bilatu:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Bat datozenak:"
 
@@ -13402,69 +13770,65 @@ msgstr "Bat datozenak:"
 msgid "Cancelling..."
 msgstr "Bertan behera uzten..."
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Zerbitzaria: %s, Mota: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Bide-izena: %s, Mota: %s"
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr "Mezuak bidali eta jaso"
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "Utzi dena"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "Eguneratzen..."
 
-#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
 
-#: mail/mail-session.c:272
-msgid "_Remember this password"
-msgstr "Gogora_tu pasahitz hau"
-
-#: mail/mail-session.c:273
-#, fuzzy
-msgid "_Remember this password for the remainder of this session"
-msgstr "Gogoratu pasahitz hau saio hau amaitu arte"
-
-#: mail/mail-session.c:330
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:280
+msgid "_Remember this password"
+msgstr "Gogora_tu pasahitz hau"
+
+#: mail/mail-session.c:281
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Gogoratu pasahitz hau saio hau amaitu arte"
+
+#: mail/mail-signature-editor.c:80
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Ezin izan da sinadura-fitxategia gorde."
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "Gorde sinadura"
-
-#: mail/mail-signature-editor.c:181
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13474,44 +13838,52 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: mail/mail-signature-editor.c:333
+#: mail/mail-signature-editor.c:229
+msgid "_Discard changes"
+msgstr ""
+
+#: mail/mail-signature-editor.c:233
+msgid "Save signature"
+msgstr "Gorde sinadura"
+
+#: mail/mail-signature-editor.c:389
 #, fuzzy
 msgid "Edit signature"
 msgstr "Gehitu irizpidea"
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:429
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML sinadura:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Izena:"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Birbidalitako mezua - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Birbidalitako mezua"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Birbidalitako mezua"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Karpeta birtuala konfiguratzen: %s"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "uri-aren karpeta birtualak eguneratzen: %s"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13524,97 +13896,97 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Editatu karpeta birtuala"
 
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "'%s' kBirtuala editatu nahian dabil, baina ez dago."
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Karpeta birtual berria"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Gairik ez)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mezua"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "Ikusita"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "Hainbat mezu"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "Txikiena"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "Txikia"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "Handia"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "Handiena"
 
-#: mail/message-list.c:1066
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "Gaur %l:%M %p"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Atzo %l:%M %p"
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:2568
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
@@ -13647,48 +14019,48 @@ msgstr "Jasotze-data"
 msgid "Size"
 msgstr "Tamaina"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Joan aurrera"
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:64
 #, fuzzy
 msgid "Follow-Up"
 msgstr "Jarraitu"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:65
 #, fuzzy
 msgid "For Your Information"
 msgstr "Iturburu-informazioa"
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Birbidali"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Erantzun"
 
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Erantzun denei"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 #, fuzzy
 msgid "Review"
 msgstr "Aurrebista"
 
-#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "Jarraitzeko bandera"
@@ -13719,53 +14091,44 @@ msgstr "Noizko: "
 msgid "_Flag:"
 msgstr "Fitxategi-izena:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "\"%2$s\"(e)ko %1$s(r)en azpian dauden karpetak eskaneatzen"
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "\"%s\"(e)ko erro-mailako karpetan eskaneatzen"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "\"%s\" karpetan harpidetzen"
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" karpetaren harpidetza kentzen"
 
-#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Karpeta"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Gorde karpetan..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Ez da zerbitzaririk hautatu"
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Hautatu zerbitzari bat."
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "All folders"
-msgstr "Karpeta guztiak"
-
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "apirila"
-
 #: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -13776,66 +14139,47 @@ msgid "Close"
 msgstr "Itxi"
 
 #: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Display Options"
-msgstr "Bistaratzeko aukerak"
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr "Honela hasten diren karpetak:"
-
-#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr "Kudeatu harpidetzak:"
 
-#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Freskatu zerrenda"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Hautatu zerbitzua"
 
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "Hautatu fitxategia"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "Harpidetza _kendu"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for the Evolution Summary."
-msgstr "Evolution-en laburpena daukan karpeta"
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Evolution-en laburpena daukan karpeta"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Summary component."
+msgid "Evolution Summary"
 msgstr "Evolution-en mezu-prestatzailea."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
 #, fuzzy
-msgid "Factory for Evolution Summary's configuration control."
-msgstr "Evolution-en Zereginen kontrolerako fabrika."
+msgid "Evolution Summary component"
+msgstr "Evolution-en mezu-prestatzailea."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
 #, fuzzy
-msgid "Factory for the Evolution Summary component."
-msgstr "Evolution-en laneko laburpena egiteko osagaiaren fabrika."
+msgid "Evolution Summary configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 #, fuzzy
 msgid "Summary Preferences"
 msgstr "Egutegi-hobespenak"
@@ -17237,7 +17581,7 @@ msgid "Hagerstown"
 msgstr "Hagerstown"
 
 #. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
 msgid "Hail"
 msgstr "Kazkabarra"
 
@@ -18932,6000 +19276,5991 @@ msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
 #: my-evolution/Locations.h:1325
-msgid "Marquette"
-msgstr "Marquette"
-
-#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Airport"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Airport"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Airport"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Middle East"
 msgstr "Ekialde ertaina"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
 msgstr "Miyakejima Airport"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Airport"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Moldova"
 msgstr "Moldavia"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Airport"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
 msgstr "Mosku Domodedovo"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
 msgstr "Mosku Sheremetyevo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr "Munchen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Murcia"
 msgstr "Murtzia"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Airport"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
 msgstr "Nagoya Airport"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
 msgstr "Nagoya Airport"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Airport"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama Airport"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Naples"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr "Brunswick Berria"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "Newfoundland"
 msgstr "Ternua"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Mexico"
 msgstr "Mexiko Berria"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
 msgstr "New Tokyo International Airport"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
 msgstr "Niigata Airport"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr "Ipar Carolina"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Dakota"
 msgstr "Ipar Dakota"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northwest Territories"
 msgstr "Iparmendebaldeko lurraldeak"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
 msgstr "Eskozia Berria"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
 msgstr "Obihiro Airport"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odesa"
 msgstr "Odesa"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
 msgstr "Oita Airport"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
 msgstr "Okayama Airport"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
 msgstr "Oki Airport"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr "Osaka International Airport"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
 msgstr "Oshima Airport"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr "Palma"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Pamplona"
 msgstr "Iru�ea"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr "Paue"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
 msgstr "Txinako Herri Errepublika"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpiny�-Rivesaltes"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Apt"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Praha"
 msgstr "Praga"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr "Quebec hiria"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
 msgid "Rioja"
 msgstr "Errioxa"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
 msgid "Rivne"
 msgstr "Rivne"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 msgid "Roma/Ciampino"
 msgstr "Erroma/Ciampino"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr "Erroma/Fiumicino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr "Erroma/Urbe"
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 msgid "Russia"
 msgstr "Errusia"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 msgid "San Sebastian"
 msgstr "Donostia"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
 msgid "Sendai Airport"
 msgstr "Sendai Airport"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O International Airport"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 msgid "South Carolina"
 msgstr "Hego Carolina"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr "Hego Dakota"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
 msgid "Sympheropol"
 msgstr "Sympheropol"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Airport"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
 #, fuzzy
 msgid "Tallinn"
 msgstr "Talinn"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr "Tanegashima Airport"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr "Tehran-Mehrabad"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr "Tokio International Airport"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr "Tokio New International Airport"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 msgid "Tottori Airport"
 msgstr "Tottori Airport"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 msgid "Toulouse"
 msgstr "Tolosa"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
 msgstr "Toyama Airport"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
 msgstr "Tsushima Airport"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
 msgid "United Arab Emirates "
 msgstr "Arabiar Emirerri Batuak "
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
 msgid "Uzhgorod"
 msgstr "Uzhgorod"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
 msgid "Valencia"
 msgstr "Valentzia"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech Airport"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr "Gasteiz"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser Airport"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Airport"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr "Mendebaldeko Virginia"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
 msgstr "Yamagata Airport"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube Airport"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
 msgid "Yao Airport"
 msgstr "Yao Airport"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr "Evolution-en laburpena daukan karpeta"
 
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "Hitzorduak"
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Hitzordurik ez"
 
-#: my-evolution/e-summary-calendar.c:418
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr "%k:%M %B %d"
 
-#: my-evolution/e-summary-calendar.c:420
-msgid "%l:%M %d %B"
+#: my-evolution/e-summary-calendar.c:407
+#, fuzzy
+msgid "%l:%M%P %d %B"
 msgstr "%l:%M %B %d"
 
-#: my-evolution/e-summary-calendar.c:438
+#: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr "Azalpenik ez"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Posta-laburpena"
 
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1102
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
 
-#. translators: Put a list of codes for locations you want to see in
-#. My Evolution by default here. You can find the list of all
-#. stations and their codes in Evolution sources.
-#. (evolution/my-evolution/Locations)
-#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:591
-msgid "KBOS"
-msgstr "KBOS"
-
-#: my-evolution/e-summary-preferences.c:584
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com-en Eguneko Hitza"
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr "Eguneko aipuak"
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Gehitu berri-iturria"
 
-#: my-evolution/e-summary-preferences.c:848
+#: my-evolution/e-summary-preferences.c:621
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Idatzi gehitu nahi duzun berri-iturriaren URLa"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "Errorea RDF deskargatzean"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Berri-iturriak"
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 #, fuzzy
 msgid "Add"
 msgstr "_Gehitu"
 
-#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Zereginik ez"
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(Azalpenik ez)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr "Eguraldia"
 
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr "Errorea izan da datuak deskargatzean"
 
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Eguraldia"
 
-#: my-evolution/e-summary.c:188
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:584
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%A, %Y %B %e"
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "Itxaron..."
 
-#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Inprimatu laburpena"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Huts egin du laburpena inprimatzean"
 
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "Laneko laburpena egiteko osagaiak ezin izan du Bonobo hasieratu.\n"
-
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " F"
 msgstr " �F"
 
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " C"
 msgstr " �C"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "knots"
 msgstr "korapilo"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr "km/h"
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "inHg"
 msgstr "inHg"
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "mmHg"
 msgstr "mmHg"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "miles"
 msgstr "milia"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr "kilometro"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "Oskarbi"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr "Hodeiak eta ostarteak"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "Hodei bakanak"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "Hodei gutxi"
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr "Zeru estalia"
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
 msgid "Invalid"
 msgstr "Baliogabea"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "Aldakorra"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "Iparraldea"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "Iparraldea - Ipar-ekialdea"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "Ipar-ekialdea"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "Ekialdea - Ipar-ekialdea"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "Ekialdea"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "Ekialdea - Hego-ekialdea"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "Hego-ekialdea"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "Hegoaldea - Hego-ekialdea"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "Hegoaldea"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "Hegoaldea - Hego-mendebaldea"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "Hego-mendebaldea"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "Mendebaldea - Hego-mendebaldea"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "Mendebaldea"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "Mendebaldea - Ipar-mendebaldea"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "Ipar-mendebaldea"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "Iparraldea - Ipar-mendebaldea"
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr "Zirimiria"
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr "Zirimiria inguruan"
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr "Zirimiri arina"
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr "Zirimiri moderatua"
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr "Zirimiri ugaria"
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr "Zirimiri oso ugaria"
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr "Zirimiri-guneak"
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr "Zirimiria tarteka"
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "Trumoi-ekaitza"
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr "Zirimiri haizetsua"
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr "Zaparradak"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr "Zirimiria han-hemenka"
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr "Zirimiri izozkorra"
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "Euria"
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr "Euria inguruan"
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr "Euri arina"
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr "Euri moderatua"
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr "Euri ugaria"
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr "Euri oso ugaria"
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr "Euri-guneak"
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr "Euria tarteka"
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr "Euri haizetsua"
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr "Euri-zaparradak"
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr "Euria han-hemenka"
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr "Euri izozkorra"
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "Elurra"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr "Elurra inguruan"
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr "Elur arina"
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr "Elur moderatua"
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr "Elur ugaria"
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr "Elur oso ugaria"
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr "Elur-guneak"
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr "Elurra tarteka"
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Elur-ekaitza"
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr "Elur-jasa haizetsua"
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr "Elur-zaparradak"
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr "Elurra han-hemenka"
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr "Elur izozkorra"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr "Elur-birrina"
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr "Elur-birrina inguruan"
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr "Elur-birrin arina"
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr "Elur-birrin moderatua"
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr "Elur-birrin ugaria"
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr "Elur-birrin oso ugaria"
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr "Elur-birrineko guneak"
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr "Elur-birrina tarteka"
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr "Elur-birrin haizetsua"
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr "Elur-birrin zaparradak"
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr "Elur-birrina han-hemenka"
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr "Elur-birrin izozkorra"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr "Izotz-kristalak"
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr "Izotz-kristalak inguruan"
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr "Izotz-kristal bakar batzuk"
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr "Izotz-kristal moderatuak"
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr "Izotz-kristal ugariak"
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr "Izotz-kristal guneak"
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr "Izotz-kristalak tarteka"
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr "Izotz-kristalezko ekaitza"
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr "Izotz-kristal haizetsuak"
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr "Izotz-kristalezko zaparradak"
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr "Izotz-kristalak han-hemenka"
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr "Izotz-kristal izoztuak"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr "Izotz-pikortak"
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr "Izotz-pikortak inguruan"
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr "Izotz-pikorta bakan batzuk"
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr "Izotz-pikorta moderatuak"
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr "Izotz-pikorta ugariak"
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr "Izotz-pikorta oso ugariak"
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr "Izotz-pikortazko guneak"
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr "Izotz-pikortak tarteka"
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr "Izotz-pikortazko ekaitza"
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr "Izotz-pikorta haizetsuak"
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr "Izotz-pikortazko zaparradak"
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr "Izotz-pikortak han-hemenka"
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr "Izotz-pikorta izoztuak"
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr "Kazkabarra inguruan"
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "Kazkabar arina"
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr "Kazkabar moderatua"
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr "Kazkabar ugaria"
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr "Kazkabar oso ugaria"
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr "Kazkabar-guneak"
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr "Kazkabarra tarteka"
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr "Kazkabar-ekaitza"
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr "Kazkabar haizetsua"
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr "Kazkabar-zaparradak"
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr "Kazkabarra han-hemenka"
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr "Kazkabar izoztua"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr "Kazkabar txikia"
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr "Kazkabar txikia inguruan"
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr "Kazkabar txiki moderatua"
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr "Kazkabar txiki ugaria"
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr "Kazkabar txiki oso ugaria"
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr "Kazkabar txikiko guneak"
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr "Kazkabar txikia tarteka"
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr "Kazkabar txikiko ekaitza"
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr "Kazkabar txiki haizetsua"
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr "Kazkabar txikiko zaparradak"
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr "Kazkabar txikia han-hemenka"
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr "Kazkabar txiki izoztua"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr "Prezipitazio ezezaguna"
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr "Prezipitazioa inguruan"
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr "Prezipitazio arina"
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr "Prezipitazio moderatua"
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr "Prezipitazio ugaria"
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr "Prezipitazio oso ugaria"
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr "Prezipitazio-guneak"
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr "Prezipitazioak tarteka"
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr "Trumoi-ekaitz ezezaguna"
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr "Prezipitazio haizetsua"
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr "Mota ezezaguneko zaparradak"
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr "Prezipitazioak han-hemenka"
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr "Prezipitazio izoztua"
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr "Lainobera"
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr "Lainobera inguruan"
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr "Lainobera arina"
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr "Lainobera moderatua"
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr "Lainobera itxia"
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr "Lainobera oso itxia"
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr "Lainobera-guneak"
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr "Lainobera tarteka"
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr "Lainobera haizetsua"
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr "Lainobera han-hemenka"
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr "Lainobera izoztua"
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr "Lainoa"
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr "Lainoa inguruan"
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr "Laino arina"
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr "Laino moderatua"
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr "Laino itxia"
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr "Laino oso itxia"
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr "Laino-guneak"
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr "Lainoa tarteka"
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr "Laino haizetsua"
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr "Lainoa han-hemenka"
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr "Laino izoztua"
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr "Kea"
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr "Kea inguruan"
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr "Ke mehea"
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr "Ke moderatua"
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr "Ke lodia"
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr "Ke oso lodia"
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr "Ke-guneak"
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr "Kea tarteka"
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr "Ke trumoitsua"
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr "Kea haizearekin"
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr "Kea han-hemenka"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr "Errauts bolkanikoa"
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr "Errauts bolkanikoa inguruan"
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr "Errauts bolkaniko moderatua"
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr "Errauts bolkaniko larria"
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr "Errauts bolkaniko oso larria"
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr "Errauts bolkanikoko guneak"
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr "Errauts bolkanikoa tarteka"
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
 msgstr "Errauts bolkaniko larria"
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr "Errauts bolkaniko haizetsua"
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 msgid "Showers of volcanic ash"
 msgstr "Errauts bolkaniko zaparradak"
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr "Errauts bolkanikoa han-hemenka"
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr "Errauts bolkaniko izoztua"
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr "Harea"
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr "Harea inguruan"
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr "Harea arina"
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr "Harea moderatua"
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr "Harea ugaria"
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr "Harea-guneak"
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr "Harea tarteka"
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr "Harea haizetsua"
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr "Harea han-hemenka"
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr "Gandua"
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr "Gandua inguruan"
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr "Gandu arina"
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr "Gandu moderatua"
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr "Gandu lodia"
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr "Gandu oso lodia"
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr "Gandu-guneak"
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr "Gandua tarteka"
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr "Gandua haizearekin"
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr "Gandua han-hemenka"
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr "Gandu izoztua"
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 msgid "Spray"
 msgstr "Zipriztinak"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 msgid "Spray in the vicinity"
 msgstr "Zipriztinak inguruan"
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 msgid "Light spray"
 msgstr "Zipriztin arinak"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 msgid "Moderate spray"
 msgstr "Zipriztin moderatuak"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 msgid "Heavy spray"
 msgstr "Zipriztin ugariak"
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 msgid "Shallow spray"
 msgstr "Zipriztin oso ugariak"
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
 msgstr "Zipriztin-guneak"
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 msgid "Partial spray"
 msgstr "Zipriztinak tarteka"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
 msgstr "Zipriztin haizetsuak"
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
 msgstr "Zipriztinak han-hemenka"
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 msgid "Freezing spray"
 msgstr "Zipriztin izoztuak"
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr "Hautsa"
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr "Hautsa inguruan"
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr "Hauts arina"
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr "Hauts moderatua"
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr "Hauts ugaria"
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr "Hauts-guneak"
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr "Hautsa tarteka"
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr "Hauts haizetsua"
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr "Hautsa han-hemenka"
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr "Haize-erauntsia"
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr "Haize-erauntsia inguruan"
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr "Haize-erauntsi arina"
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr "Haize-erauntsi moderatua"
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr "Haize-erauntsi indartsua"
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr "Haize-erauntsiak tarteka"
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr "Haize-erauntsi trumoitsua"
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr "Haize-erauntsi oso haizetsua"
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr "Haize-erauntsiak han-hemenka"
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr "Haize-erauntsi izoztua"
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr "Harea-ekaitza"
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr "Harea-ekaitza inguruan"
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr "Harea-ekaitz arina"
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr "Harea-ekaitz moderatua"
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr "Harea-ekaitz indartsua"
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr "Harea-ekaitz oso indartsua"
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr "Harea-ekaitza tarteka"
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr "Harea-ekaitz trumoitsua"
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr "Harea-ekaitz haizetsua"
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr "Harea-ekaitza han-hemenka"
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr "Harea izoztuko ekaitza"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr "Hauts-ekaitza"
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr "Hauts-ekaitza inguruan"
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr "Hauts-ekaitz arina"
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr "Hauts-ekaitz moderatua"
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr "Hauts-ekaitz indartsua"
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr "Hauts-ekaitz oso indartsua"
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr "Hauts-ekaitza tarteka"
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr "Hauts-ekaitz trumoitsua"
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr "Hauts-ekaitz haizetsua"
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr "Hauts-ekaitza han-hemenka"
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr "Hauts izoztuko ekaitza"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr "Tragarroi-hodeia"
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr "Tragarroi-hodeia inguruan"
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr "Tragarroi-hodei arina"
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr "Tragarroi-hodei moderatua"
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr "Tragarroi-hodei lodia"
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr "Tragarroi-hodei oso lodia"
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr "Tragarroi-hodei guneak"
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr "Tragarroi-hodeiak tarteka"
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr "Tragarroi-hodeia haizearekin"
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr "Tragarroi-hodeiak han-hemenka"
 
 #. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
+#: my-evolution/metar.c:443 my-evolution/metar.c:452
 msgid "Tornado"
 msgstr "Tornadoa"
 
-#: my-evolution/metar.c:443
+#: my-evolution/metar.c:444
 msgid "Tornado in the vicinity"
 msgstr "Tornadoa inguruan"
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr "Tornado moderatua"
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr "Tornado bortitza"
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr "Tornadoak tarteka"
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr "Tornado trumoitsua"
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr "Tornadoak han-hemenka"
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr "Tornado izoztua"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr "Hauts-zurrunbiloak"
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr "Hauts-zurrunbiloak inguruan"
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr "Hauts-zurrunbilo arinak"
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr "Hauts-zurrunbilo moderatuak"
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr "Hauts-zurrunbilo indartsuak"
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr "Hauts-zurrunbilo oso indartsuak"
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr "Hauts-zurrunbilo guneak"
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr "Hauts-zurrunbiloak tarteka"
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr "Hauts-zurrunbilo haizetsuak"
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr "Hauts-zurrunbiloak han-hemenka"
 
@@ -25023,33 +25358,34 @@ msgstr "An_tolatu"
 msgid "_Weather"
 msgstr "Eg_uraldia"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for Evolution folder settings."
-msgstr "Evolution-en mezu-prestatzailerako fabrika."
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution-en shell-a."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 #, fuzzy
 msgid "Folder Settings"
 msgstr "Postaren ezarpenak"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "Evolution-en shell-a."
-
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Erakutsi xehetasunak"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "Utzi bertan behera eragiketa"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25058,54 +25394,38 @@ msgstr ""
 "Ezin izan da karpeta transferitu:\n"
 "%s"
 
-#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, fuzzy, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "Ireki honekin: %s..."
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 #, fuzzy
 msgid "Add a Folder"
 msgstr "Bidalitakoen karpeta gisa"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 msgid "Drafts"
 msgstr "Zirriborroak"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
-#: shell/e-shortcuts.c:1055
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Sarrerako ontzia"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Irteerako ontzia"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 msgid "Sent"
 msgstr "Bidalita"
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "Evolution-en instalazioa"
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Evolution-en bertsio berri honek fitxategi gehigarriak instalatu\n"
-"behar ditu Evolution-eko zure direktorio pertsonalean"
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "Egin klik \"Ados\"en fitxategiak instalatzeko, edo \"Utzi\"n irteteko."
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Fitxategiak ezin izan dira behar bezala eguneratu"
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -25116,7 +25436,7 @@ msgstr ""
 " %s\n"
 "Errorea: %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -25125,40 +25445,7 @@ msgstr ""
 "Errorea gertatu da `%s'(e)n \n"
 "fitxategiak kopiatzean."
 
-#: shell/e-setup.c:282
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Ezin izan da %s \n"
-"direktorioa sortu:\n"
-"%s"
-
-#: shell/e-setup.c:300
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-"%s direktorioak\n"
-"ez du behar den baimenik. Eman iezaiozu irakurtzeko \n"
-"eta exekutatzeko baimena eta berrabiarazi Evolution."
-
-#: shell/e-setup.c:306
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-"%s fitxategia\n"
-"kendu egin behar da Evolution-ek ondo funtziona dezan.\n"
-"Ken ezazu eta berrabiarazi Evolution."
-
-#: shell/e-setup.c:329
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25169,21 +25456,7 @@ msgstr ""
 "Aldatu lekuz, Evolution-en erabiltzaile-fitxategiak\n"
 "instalatu ahal izateko."
 
-#: shell/e-setup.c:343
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-"Evolution-ek laneko laburpenen \n"
-"direktorio zahar bat aurkitu du.\n"
-"Kendu egin behar da Evolution \n"
-"exekutatu ahal izateko.\n"
-"Direktorio hori kendu nahi duzu?"
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25199,27 +25472,27 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Hauei esker daukazu:"
 
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
 msgstr "Egite-data"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "Karpeta bereziak"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
 msgstr "Karpeta bereziak"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "Karpeta bereziak"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 #, fuzzy
 msgid "Autocompletion Folders"
 msgstr "Egite-data"
@@ -25229,44 +25502,44 @@ msgstr "Egite-data"
 msgid "Cannot copy folder: %s"
 msgstr "Ezin da karpeta egiaztatu: %s: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, fuzzy, c-format
 msgid "Cannot move folder: %s"
 msgstr ""
 "Ezin izan da karpetaren izena aldatu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Karpeta bat ezin da bere buruaren gainera eraman."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Karpeta bat ezin da bere buruaren gainean kopiatu."
 
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:204
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Karpeta bat ezin da bere menpeko karpeta batera eraman."
 
-#: shell/e-shell-folder-commands.c:321
+#: shell/e-shell-folder-commands.c:319
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Adierazi zein karpetatan kopiatu nahi duzun \"%s\" karpeta:"
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Kopiatu karpeta"
 
-#: shell/e-shell-folder-commands.c:365
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Adierazi zein karpetatara eraman nahi duzun \"%s\" karpeta:"
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Eraman karpeta"
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25275,17 +25548,17 @@ msgstr ""
 "Ezin da karpeta ezabatu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Ezabatu \"%s\""
-
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Ezabatu '%s' karpeta"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Ezabatu \"%s\""
+
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25294,26 +25567,26 @@ msgstr ""
 "Ezin izan da karpetaren izena aldatu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Karpetaren izena aldatu"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:165
+#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-creation-dialog.c:170
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Adierazitako karpeta-izena ez da baliozkoa: %s"
 
-#: shell/e-shell-folder-commands.c:586
+#: shell/e-shell-folder-commands.c:583
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:586
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25322,7 +25595,7 @@ msgstr ""
 "Ezin izan da karpetaren izena aldatu:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:122
+#: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25331,24 +25604,20 @@ msgstr ""
 "Ezin da sortu adierazitako karpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Sortu _karpeta berria...."
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "Berria..."
-
-#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(izengabea)"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr "Aukeratu inportatzailearen mota:"
 
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -25362,11 +25631,11 @@ msgstr ""
 "Ez badakizu, \"Automatikoa\" hauta dezakezu eta Evolution saiatuko da "
 "bideratzen."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Hautatu inportatu nahi duzun informazioa:"
 
-#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25375,22 +25644,22 @@ msgstr ""
 "%s inportatzen\n"
 "%d elementua inportatzen."
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "Hautatu karpeta"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "'%s' fitxategia ez dago "
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:552
 msgid "Evolution Error"
 msgstr "Evolution errorea "
 
-#: shell/e-shell-importer.c:504
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25399,11 +25668,11 @@ msgstr ""
 "Ez dago %s maneiatzeko\n"
 "gai den inportatzailerik"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Inportatzen"
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25412,17 +25681,17 @@ msgstr ""
 "%s inportatzen.\n"
 "%s abiarazten"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Errorea %s abiaraztean"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Errorea %s kargatzean"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25431,31 +25700,31 @@ msgstr ""
 "%s inportatzen\n"
 "1. elementua inportatzen."
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Fitxategi-izena:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Fitxategi-mota:"
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Inportatu programa zaharretako datuak eta ezarpenak"
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Inportatu fitxategi bakarra"
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25463,32 +25732,32 @@ msgstr ""
 "Itxaron...\n"
 "Lehengo instalazio bila eskaneatzen"
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Inportatzaile adimendunak abiarazten"
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "%s(e)tik:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Aukeratu datu hauek inportatzeko helburu-karpeta"
 
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Inportatu"
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Konexioak ixten..."
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, fuzzy, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -25497,159 +25766,161 @@ msgstr ""
 "Errorea '%s' saiatu denean:\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 #, fuzzy
 msgid "Syncing Folder"
 msgstr "Karpeta sinkronizatzen"
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:317
+#: shell/e-shell-offline-sync.c:311
 #, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:345
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:357
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+#, fuzzy
+msgid "Please select a user."
+msgstr "Hautatu zerbitzari bat."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 #, fuzzy
 msgid "Opening Folder"
 msgstr "%s karpeta irekitzen"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "%s karpeta irekitzen"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Ireki honekin: %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:455
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:513
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
 "Ezin da sortu adierazitako karpeta:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:159
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Ezin izan da Evolution Mailer Assistant interfazea abiarazi\n"
-"(%s)"
-
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Ezin izan da Evolution Mailer Assistant interfazea abiarazi\n"
-
-#: shell/e-shell-user-creatable-items-handler.c:579
-#: shell/e-shell-user-creatable-items-handler.c:633
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:636
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr "Berria"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Ez da karpeta-izenik zehaztu"
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Karpeta-izenak ezin du Itzulera karaktererik eduki."
 
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
-msgstr "Karpeta-izenak ezin du barrarik eduki."
+#: shell/e-shell-utils.c:129
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Karpeta-izenak ezin du Itzulera karaktererik eduki."
+
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Karpeta-izenak ezin du Itzulera karaktererik eduki."
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' eta '..' karpeta-izen erreserbatuak dira."
 
-#: shell/e-shell-view-menu.c:94
+#: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Ez dirudi GNOME Pilot tresnak instalatuta dauzkazunik sisteman."
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr "Errorea %s exekutatzean."
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy ez da aurkitu zure $BIDE-IZENEAN."
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "Ezin izan da Bug Buddy exekutatu."
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "Ezin izan da Bug Buddy exekutatu."
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution-i buruz"
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "Joan karpeta honetara..."
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr "Hautatu ireki nahi duzun karpeta"
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Sortu lasterbide berria"
 
-#: shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:618
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Hautatu zein karpeta seinalatu behar duen lasterbideak:"
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Ez dago karpetarik bistaratuta)"
 
-#: shell/e-shell-view.c:1861
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1863
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(bat ere ez)"
 
-#: shell/e-shell-view.c:1910
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution linean dago. Egin klik botoi honetan lineaz kanpo lan "
 "egiteko."
 
-#: shell/e-shell-view.c:1917
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
 
-#: shell/e-shell-view.c:1923
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25668,12 +25939,12 @@ msgstr ""
 "Aktibazio-sistemak eman duen errorea:\n"
 "%s"
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ezin da biltegi lokala ezarri -- %s"
 
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25684,150 +25955,144 @@ msgstr ""
 "ustekabean itxi da. Evolution-etik irten eta berriro sartu beharko \n"
 "duzu datu horiek berriro atzitzeko."
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Argumentu baliogabeak"
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Ezin da OAFen erregistratu"
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Ez da aurkitu konfigurazioko datu-basea"
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Errore generikoa"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "Sortu lasterbide-talde berria"
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Taldearen izena:"
 
-#: shell/e-shortcuts-view.c:173
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
+#: shell/e-shortcuts-view.c:179
+#, fuzzy, c-format
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
 msgstr ""
 "Ziur zaude `%s' taldea kendu\n"
 "nahi duzula lasterbide-barratik?"
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "Ez kendu"
-
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Aldatu lasterbide-taldearen izena"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Jarri hautatutako lasterbide-taldeari izen hau:"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "_Ikono txikiak"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Erakutsi lasterbideak ikono txiki gisa"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "Ikono _handiak"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Erakutsi lasterbideak ikono handi gisa"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_Talde berria..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Sortu lasterbide-talde berria"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "_Kendu talde hau..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Kendu lasterbide-talde hau"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "_Aldatu izena talde honi..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Aldatu izena lasterbide-taldeari"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ezkutatu lasterbide-barra"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Ezkutatu lasterbide-barra"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create _Default Shortcuts"
 msgstr "Sortu lasterbide berria"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 #, fuzzy
 msgid "Create Default Shortcuts"
 msgstr "Sortu lasterbide berria"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Aldatu izena lasterbideari"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Jarri hautatutako lasterbideari izen hau:"
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Ireki lasterbide honekin estekatutako karpeta"
 
-#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Ireki _leiho berrian"
 
-#: shell/e-shortcuts-view.c:410
+#: shell/e-shortcuts-view.c:417
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Ireki leiho berrian lasterbide honekin estekatutako karpeta"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "_Izena aldatu"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Aldatu izena lasterbide honi"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "_Kendu"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Kendu lasterbide hau lasterbide-barratik"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Errorea lasterbideak gordetzean."
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Lasterbideak"
 
@@ -25836,73 +26101,73 @@ msgstr "Lasterbideak"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Errorerik ez"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Badago lehendik izen hori duen karpeta bat"
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Adierazitako karpeta-mota ez da baliozkoa"
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "S/Iko errorea"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Ez dago karpeta sortzeko behar adina leku"
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "Karpeta ez dago hutsik"
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "Adierazitako karpeta ez da aurkitu"
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Funtzioa ez dago inplementatuta biltegiratze honetan"
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Eragiketa ez da onartzen"
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "Adierazitako mota ez da onartzen biltegiratze honetan"
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "Adierazitako karpeta ezin da aldatu edo kendu"
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Karpeta bat ezin da bere azpikoen ume bihurtu."
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr "Ezin da izen horretako karpetarik sortu"
 
-#: shell/e-storage.c:599
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-task-widget.c:191
+#: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:196
+#: shell/e-task-widget.c:216
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d osatuta)"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<egin klik hemen karpeta hautatzeko>"
 
@@ -25943,83 +26208,80 @@ msgstr ""
 "Aktibazio-sistemak eman duen errorea:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA errorea"
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Etenda"
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Argumentu baliogabea"
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Badu jabea"
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Jaberik ez"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Ez da aurkitu"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Onartzen ez den mota"
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Onartzen ez den eskema"
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Onartzen ez den eragiketa"
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Barne-errorea"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Badago"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "URI baliogabea"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Azpikarpetak ditu"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Ez dago lekurik"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Jabe zaharra hil egin da"
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Proba-mota:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Konexio aktiboak"
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Evolution-en mezu-prestatzailea."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Click OK to close these connections and go offline"
 msgstr "Klik egin 'Ados'en konexio hauek ixteko eta lineaz kanpo geratzeko"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Ostalaria"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr "Konexio hauek aktibo daude:"
 
@@ -26043,15 +26305,15 @@ msgstr "_Posta"
 msgid "_Tasks:"
 msgstr "Zereginak"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Karpeta-izena:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "Karpeta-mota:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Adierazi karpeta non sortu behar den:"
 
@@ -26075,29 +26337,30 @@ msgstr "Karpeta-izena:"
 msgid "_User:"
 msgstr "_Erabiltzaile-izena:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution konfiguratzeko laguntzailea"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Fitxategiak inportatzen"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Ordu-zona "
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Ongi etorri"
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
+#, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 "Ongi etorri Evolution-era. Ondorengo pantailetan Evolution \n"
 "zure posta-kontuekin konektatutako da eta beste aplikazio \n"
@@ -26105,13 +26368,13 @@ msgstr ""
 "\n"
 "Jarraitzeko, egin klik \"Hurrengoa\" botoian. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
 #, fuzzy
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 "Evolution konfiguratzeko behar diren datu guztiak \n"
 "eman dituzu.  \n"
@@ -26152,41 +26415,42 @@ msgstr ""
 "Laguntzaile honek kanpoko fitxategiak Evolution-era inportatzeko\n"
 "prozesuan zehar gidatuko zaitu."
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "Inportatzaileak"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Ez inportatu"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Ez galdetu berriro"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution-ek datu-iturburu hauek aurkitu ditu:"
 
-#: shell/main.c:96
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution "
 
-#: shell/main.c:102
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ixten ari da..."
 
-#: shell/main.c:227
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:266
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -26209,7 +26473,7 @@ msgstr ""
 "Espero dugu gogokoa izango duzula gure lan gogorraren emaitza,\n"
 "eta atsegin handiz gauzkazu zure ekarpenen zain!\n"
 
-#: shell/main.c:250
+#: shell/main.c:290
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -26218,41 +26482,46 @@ msgstr ""
 "Eskerrik asko\n"
 "Evolution Taldea\n"
 
-#: shell/main.c:259
+#: shell/main.c:298
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Ez galdetu berriro"
 
-#: shell/main.c:394
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ezin da Ximian Evolution-en shell-a atzitu."
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ezin da Ximian Evolution-en shell-a abiarazi: %s"
 
-#: shell/main.c:485
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Desgaitu splash pantaila"
 
-#: shell/main.c:487
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Hasi lineaz kanpo"
 
-#: shell/main.c:489
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
-#: shell/main.c:491
+#: shell/main.c:535
+#, fuzzy
+msgid "Forcibly shut down all evolution components"
+msgstr "Evolution-en ohar-osagairako fabrika."
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr "Bidali osagai guztien arazketa-irteera fitxategi batera."
 
-#: shell/main.c:493
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26261,29 +26530,60 @@ msgstr ""
 "%s: --online eta --offline ezin dira batera erabili.\n"
 "  Erabili %s --help informazio gehiago lortzeko.\n"
 
-#: shell/main.c:542
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Ezin da Bonobo osagaiaren sistema hasieratu."
-
-#: tools/evolution-addressbook-abuse.c:80
-#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-abuse.c:81
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Errorea helbide-liburu lehenetsia kargatzean."
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Sarrera-fitxategia"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Irteera-fitxategia"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Ez da fitxategi-izenik eman."
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Gehitu eranskina..."
+
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:327
+#, fuzzy
+msgid "Description of the attachment."
+msgstr "Azalpenak hau dauka"
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:329
+#, fuzzy
+msgid "Default subject for the message."
+msgstr "Ebaki hautatutako mezuak"
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "Ezin izan da karpetaren izena aldatu: %s"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopiatu kontaktua(k) beste karpeta batean..."
@@ -26372,7 +26672,7 @@ msgstr "Ikusi uneko kontaktua"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr "_Ekintzak"
 
@@ -26490,7 +26790,7 @@ msgid "Print this item"
 msgstr "Inprimatu elementu hau"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "Gorde"
 
@@ -26517,7 +26817,7 @@ msgstr "Gorde elementu hau diskoan"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "Fi_txategia"
 
@@ -26770,7 +27070,7 @@ msgstr "Hari bateko mezuen zerrenda"
 msgid "_Expunge"
 msgstr "_Borratu betiko"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Karpeta"
 
@@ -27029,7 +27329,7 @@ msgstr "Zereginaren erantzuna"
 
 #: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Post a reply to a message message in a Public folder"
+msgid "Post a reply to a message in a Public folder"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
 #: ui/evolution-mail-message.xml.h:64
@@ -27190,7 +27490,7 @@ msgstr "_Aipamen gisa"
 msgid "_Resend..."
 msgstr "I_zena aldatu..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Tresnak"
 
@@ -27205,12 +27505,12 @@ msgstr "Itxi leiho hau"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Close"
 msgstr "_Itxi"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "I_kusi"
 
@@ -27218,6 +27518,10 @@ msgstr "I_kusi"
 msgid "Attach"
 msgstr "Erantsi"
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Erantsi fitxategi bat"
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Itxi uneko fitxategia"
@@ -27388,7 +27692,7 @@ msgstr "_HTML"
 msgid "Save the current file and close the window"
 msgstr "Gorde elementua eta itxi elkarrizketa-koadroa"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr "_Laguntza"
 
@@ -27573,128 +27877,118 @@ msgstr "_Pilot-en ezarpenak..."
 
 #: ui/evolution.xml.h:27
 #, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "_Pilot-en ezarpenak..."
-
-#: ui/evolution.xml.h:28
-#, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Sortu _karpeta berria...."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Bidali / Jaso"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Bidali ilarako mezuak eta hartu mezu berriak"
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "Posta-konfigurazioa"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Posta-konfigurazioa"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Erakutsi Ximian Evolution-i buruzko informazioa"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Bidali programa-erroreen berri-ematea"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "_Bidali akatsen berri-ematea"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Eman programa-erroreen berri Bug Buddy erabiliz"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Txandakatu"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Erakutsi/ezkutatu karpeta-barra "
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Erakutsi/ezkutatu lasterbide-barra "
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Gaitu/desgaitu lineaz kanpo lanean aritzea."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Bistaratu hautatutako karpeta"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "Xiimian Evolution-i buruzko MEGak (FAQ)"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "Ximian E_volution-i buruz..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "Ko_piatu..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Karpeta-barra"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Karpeta"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "_Joan karpeta honetara..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "_Inportatu..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Lekuz aldatu..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "Berr_ia"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "Kar_peta berria"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "Sortu _karpeta berria...."
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "I_zena aldatu..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Bidali / Jaso"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "La_sterbide-barra"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Lasterbidea"
@@ -27780,9 +28074,8 @@ msgstr "Kategoria hau dutenak"
 msgid "_Tasks"
 msgstr "_Zeregina"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr "UTC"
 
@@ -27808,20 +28101,20 @@ msgstr ""
 "ordu-zona.\n"
 " Erabili saguaren eskuineko botoia txikiagotzeko."
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "_Uneko ikuspegia"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:357
+#: widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Ikuspegi pertsonalizatua"
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr "Gorde ikuspegi pertsonalizatua"
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "Definitu ikuspegiak"
 
@@ -27832,19 +28125,19 @@ msgid "MTWTFSS"
 msgstr "AAAOOLI"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1070
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "Orain"
 
-#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr "Gaur"
 
-#: widgets/misc/e-cell-date-edit.c:797
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ordua formatu honetan idatzi behar da: %s"
@@ -27853,80 +28146,80 @@ msgstr "Ordua formatu honetan idatzi behar da: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Ehunekoaren balioak 0 and 100 bitartekoa izan behar du (biak barne)."
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Baltikoa"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Europako Erdialdekoa"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Txinatarra"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Zirilikoa"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Grekoa"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr "Hebrearra"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Japoniarra"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Korearra"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Turkiarra"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "Europako Mendebaldekoa"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Tradizionala"
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr "Sinplifikatua"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ukrainarra"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 msgid "Visual"
 msgstr "Bisuala"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Karaktere-joko ezezaguna: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Adierazi erabili behar den karaktere-jokoa"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Besterik..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Karaktere-kodeketa"
 
@@ -27934,11 +28227,12 @@ msgstr "Karaktere-kodeketa"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Bilaketa-editorea"
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Gorde bilaketa"
 
@@ -27957,66 +28251,609 @@ msgstr "Gehitu gordetako bilaketei"
 msgid "_Advanced..."
 msgstr "Aurreratua..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "Informazioa"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "Errorea"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "Galdera"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "Mezua"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "Ez erakutsi mezu hau berriro."
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Bilatu"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 #, fuzzy
 msgid "_Find Now"
 msgstr "Bilatu orain"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "Garbitu"
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:833
+msgid "Item ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:840
+msgid "Subitem ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:847
+#, fuzzy
+msgid "Text"
+msgstr "Proba"
+
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Garbitu"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Bilatu orain"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Helbide-liburu pertsonalaren zerbitzaria"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Evolution-en egutegiaren laneko laburpenaren osagaia."
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "LDIF fitxategiak Evolution-era inportatzeko fabrika."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "LDIF fitxategiak Evolution-era inportatzen ditu."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "VCard fitxategiak Evolution-era inportatzeko fabrika."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "VCard fitxategiak Evolution-era inportatzen ditu."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Bonobo-ren kontrola helbide pop-up batentzat."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Bonobo-ren kontrola helbidea bistaratzeko."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Helbide-liburua bistaratzen duen mostrako Bonobo kontrola."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Evolution-en helbide-liburuko minitxartela erakusten duen kontrola."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Kontaktuak maneiatzeko Evolution-en osagaia"
+
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "Helbide-liburuko minitxartelak kontrolatzeko fabrika"
+
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "Helbide-liburuko helbideen bistaratzailearen fabrika"
+
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "Mostrako helbide-liburuaren kontrolerako fabrika"
+
+#, fuzzy
+#~ msgid "380"
+#~ msgstr "389"
+
+#, fuzzy
+#~ msgid "<- _Remove"
+#~ msgstr "_Kendu"
+
+#, fuzzy
+#~ msgid "<< Fewer Options"
+#~ msgstr "Aukerak"
+
+#, fuzzy
+#~ msgid "DN Customization"
+#~ msgstr "Ez dago informaziorik"
+
+#, fuzzy
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution-en alarma"
+
+#, fuzzy
+#~ msgid "LDAP Attribute"
+#~ msgstr "LDAP autentifikazioa"
+
+#, fuzzy
+#~ msgid "Mappings"
+#~ msgstr "Marjinak"
+
+#, fuzzy
+#~ msgid "R_estore Defaults"
+#~ msgstr "Lehenespenak"
+
+#, fuzzy
+#~ msgid "Re_store Defaults"
+#~ msgstr "Lehenespenak"
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "Hautatu denak"
+
+#, fuzzy
+#~ msgid "_Add ->"
+#~ msgstr "Gehitu"
+
+#, fuzzy
+#~ msgid "_Add Mapping"
+#~ msgstr "Gehitu ekintza"
+
+#, fuzzy
+#~ msgid "_Add to DN"
+#~ msgstr "Gehitu ekintza"
+
+#, fuzzy
+#~ msgid "_Always"
+#~ msgstr "Alarmak"
+
+#, fuzzy
+#~ msgid "_Delete Mapping"
+#~ msgstr "Ezaba_tu dena"
+
+#, fuzzy
+#~ msgid "_Distinguished Name (DN):"
+#~ msgstr "Izen bereizitua (DN)"
+
+#, fuzzy
+#~ msgid "_Edit Mapping"
+#~ msgstr "_Editatu hitzordua"
+
+#, fuzzy
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Evolution-en alarma"
+
+#, fuzzy
+#~ msgid "_More Options >>"
+#~ msgstr "Au_kerak"
+
+#, fuzzy
+#~ msgid "_Restore Defaults"
+#~ msgstr "Lehenespenak"
+
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "%d kontua"
+
+#, fuzzy
+#~ msgid "account-editor"
+#~ msgstr "contact-list-editor"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Helbide-liburuko izen-hautaketaren interfazerako fabrika"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Editatu kontaktuen zerrenda"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Kontaktu-zerrenda izengabea"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d ez da erakusten)"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "K_ontaktuak..."
+
+#~ msgid "Phone Types"
+#~ msgstr "Telefono-motak"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "Kontaktua ezabatu?"
+
+#~ msgid "Display Cards?"
+#~ msgstr "Txartelak bistaratu?"
+
+#~ msgid "Display Cards"
+#~ msgstr "Txartelak bistaratu"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Zereginen zerrenda bistaratzen duen Bonobo kontrola."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Egutegia bistaratzen duen mostrako Bonobo kontrola."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Evolution-en mezu-prestatzailerako fabrika."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Egutegia maneiatzeko Evolution-en osagaia."
+
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "Egutegiaren iTip ikuspegiaren kontrolerako fabrika"
+
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "Mostrako egutegi-kontrolerako fabrika"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "Egutegi-osagaien editorearen elkarrizketak zentralizatzeko fabrika"
+
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "Osagaien editorearen fabrika sortzeko fabrika"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Alarma bidezko jakinarazpen-zerbitzua"
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "Ezin izan da GNOME hasieratu"
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders.  You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "Mezu bidezko oroigarria da hau, baina Evolution-ek ez du era horretako "
+#~ "oroigarririk onartzen oraingoz.  Ezingo dituzu editatu oroigarriaren "
+#~ "aukerak."
+
+#, fuzzy
+#~ msgid "st"
+#~ msgstr "1."
+
+#, fuzzy
+#~ msgid "nd"
+#~ msgstr "2."
+
+#, fuzzy
+#~ msgid "rd"
+#~ msgstr "3."
+
+#~ msgid "th"
+#~ msgstr "."
+
+#, fuzzy
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "Ezin izan da Bonobo hasieratu"
+
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "Ezin izan da sortu osagai-editorearen fabrika"
+
+#~ msgid "Print Calendar"
+#~ msgstr "Inprimatu egutegia"
+
+#~ msgid ""
+#~ "Could not create the tasks view.  Please check your ORBit and OAF setup."
+#~ msgstr ""
+#~ "Ezin izan da egutegiaren ikuspegia sortu.  Egiaztatu ORBit eta OAF "
+#~ "konfigurazioa."
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Egutegiaren karpetan zenituen zereginak hartu ditu Evolution-ek eta "
+#~ "zereginen karpeta berrira migratu ditu automatikoki."
+
+#~ msgid ""
+#~ "Evolution has tried to take the tasks that were in your calendar folder "
+#~ "and migrate them to the new tasks folder.\n"
+#~ "Some of the tasks could not be migrated, so this process may be attempted "
+#~ "again in the future."
+#~ msgstr ""
+#~ "Egutegiaren karpetan zenituen zereginak hartu eta zereginen karpeta "
+#~ "berrira migratzen saiatu da Evolution.\n"
+#~ "Zereginetako batzuk ezin izan dira migratu eta, ondorioz, prozesu hau "
+#~ "geroago berriz egiten saiatuko da."
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "Ezin izan da `%s' ireki; egutegiaren karpetatik ez da elementurik "
+#~ "migratuko zereginen karpetara."
+
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "`%s' kargatzeko behar den metodoa ez da onartzen; egutegiaren karpetatik  "
+#~ "ez da elementurik migratuko zereginen karpetara."
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "iCalendar fitxategiak Evolution-era inportatzeko fabrika"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "iCalendar fitxategiak Evolution-era inportatzen ditu"
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "VCalendar fitxategiak Evolution-era inportatzen ditu"
+
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr ""
+#~ "Ezin da mezua hartu: %s %s karpetatik\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Ezin izan da biltegiarekin konektatu: %s"
+
+#~ msgid "Warning!"
+#~ msgstr "Kontuz!"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Ezin izan da mezuak prestatzeko leihoa sortu, oraindik ez \n"
+#~ "duzulako identitaterik konfiguratu posta-osagaian."
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Ezin da Evolution-en mezu-prestatzailea hasieratu."
+
+#~ msgid "minute"
+#~ msgstr "minutu "
+
+#~ msgid "hour"
+#~ msgstr "ordu "
+
+#~ msgid "week"
+#~ msgstr "aste "
+
+#~ msgid "year"
+#~ msgstr "urte "
+
+#~ msgid "Add action"
+#~ msgstr "Gehitu ekintza"
+
+#~ msgid "Add criterion"
+#~ msgstr "Gehitu irizpidea"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Evolution-en mezu-prestatzailerako fabrika."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Evolution-en mezu-prestatzailerako fabrika."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Evolution-en mezu-prestatzailerako fabrika."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Posta maneiatzeko Evolution-en osagaia."
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Egutegi pertsonalaren zerbitzaria; egutegi-fabrika"
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Posta-karpeten fabrikarako Evolution-en osagaia."
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): ezin izan da GNOME-VFS hasieratu"
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Evolution-en mezu-prestatzailerako fabrika."
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): ezin izan da GNOME hasieratu"
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "Posta-laburpenaren osagairako fabrika."
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
+#, fuzzy
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "Kontuz: mezua aldatu egin da"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Ezin da Evolution-en posta-osagaia hasieratu."
+
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Ezin da Evolution-en posta konfiguratzeko osagaia hasieratu."
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Ezin da Evolution-en karpeta-informazioaren osagaia hasieratu."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "mbox Evolution-era inportatzeko fabrika"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "mbox fitxategiak Evolution-era inportatzen ditu"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Outlook Express 4ko mezuak Evolution-era inportatzeko fabrika"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Outlook Express 4ko fitxategiak inportatzen ditu Evolution-era"
+
+#~ msgid "Really delete account?"
+#~ msgstr "Ziur zaude kontua ezabatu nahi duzula?"
+
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Irakurri gabeko mezuak dituen hurrengo karpetara joan?"
+
+#~ msgid ""
+#~ "There are no more new messages in this folder.\n"
+#~ "Would you like to go to the next folder?"
+#~ msgstr ""
+#~ "Karpeta honetan ez dago mezu gehiago.\n"
+#~ "Hurrengo karpetara joan nahi duzu?"
+
+#~ msgid "US-Letter"
+#~ msgstr "US-Letter"
+
+#, fuzzy
+#~ msgid "Add Signature"
+#~ msgstr "Gorde sinadura"
+
+#, fuzzy
+#~ msgid "Account %d"
+#~ msgstr "Kontua"
+
+#, fuzzy
+#~ msgid "_Variable-width:"
+#~ msgstr "Aldakorra"
+
+#~ msgid "All folders"
+#~ msgstr "Karpeta guztiak"
+
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "apirila"
+
+#, fuzzy
+#~ msgid "Display Options"
+#~ msgstr "Bistaratzeko aukerak"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Honela hasten diren karpetak:"
+
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "Hautatu fitxategia"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Evolution-en laburpena daukan karpeta"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr "Evolution-en laneko laburpena egiteko osagaiaren fabrika."
+
+#~ msgid "Marquette"
+#~ msgstr "Marquette"
+
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Laneko laburpena egiteko osagaiak ezin izan du Bonobo hasieratu.\n"
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Evolution-en mezu-prestatzailerako fabrika."
+
+#~ msgid "Evolution installation"
+#~ msgstr "Evolution-en instalazioa"
+
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "Evolution-en bertsio berri honek fitxategi gehigarriak instalatu\n"
+#~ "behar ditu Evolution-eko zure direktorio pertsonalean"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "Egin klik \"Ados\"en fitxategiak instalatzeko, edo \"Utzi\"n irteteko."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ezin izan da %s \n"
+#~ "direktorioa sortu:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Directory %s\n"
+#~ "does not have the right permissions. Please make it\n"
+#~ "readable and executable and restart Evolution."
+#~ msgstr ""
+#~ "%s direktorioak\n"
+#~ "ez du behar den baimenik. Eman iezaiozu irakurtzeko \n"
+#~ "eta exekutatzeko baimena eta berrabiarazi Evolution."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "%s fitxategia\n"
+#~ "kendu egin behar da Evolution-ek ondo funtziona dezan.\n"
+#~ "Ken ezazu eta berrabiarazi Evolution."
+
+#~ msgid ""
+#~ "Evolution has detected an old\n"
+#~ "Executive-Summary directory.\n"
+#~ "This needs to be removed before\n"
+#~ "Evolution will run.\n"
+#~ "Do you want me to remove this directory?"
+#~ msgstr ""
+#~ "Evolution-ek laneko laburpenen \n"
+#~ "direktorio zahar bat aurkitu du.\n"
+#~ "Kendu egin behar da Evolution \n"
+#~ "exekutatu ahal izateko.\n"
+#~ "Direktorio hori kendu nahi duzu?"
+
+#~ msgid "New..."
+#~ msgstr "Berria..."
+
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Ezin izan da Evolution Mailer Assistant interfazea abiarazi\n"
+#~ "(%s)"
+
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Ezin izan da Evolution Mailer Assistant interfazea abiarazi\n"
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Karpeta-izenak ezin du barrarik eduki."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Bug buddy ez da aurkitu zure $BIDE-IZENEAN."
+
+#~ msgid "Don't remove"
+#~ msgstr "Ez kendu"
+
+#~ msgid "Active connections"
+#~ msgstr "Konexio aktiboak"
+
+#~ msgid "Host"
+#~ msgstr "Ostalaria"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Ezin da Bonobo osagaiaren sistema hasieratu."
+
+#~ msgid "Output File"
+#~ msgstr "Irteera-fitxategia"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "_Pilot-en ezarpenak..."
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Posta-konfigurazioa"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Helbide-liburu pertsonalaren zerbitzaria"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Egutegi pertsonalaren zerbitzaria; egutegi-fabrika"
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): ezin izan da GNOME-VFS hasieratu"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): ezin izan da GNOME hasieratu"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 
 #, fuzzy
 #~ msgid "_Configure..."
@@ -28052,9 +28889,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Copy selected messages"
 #~ msgstr "Kopiatu hautatutako mezuak"
 
-#~ msgid "Cut selected messages"
-#~ msgstr "Ebaki hautatutako mezuak"
-
 #, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "_Kendu"
@@ -28095,9 +28929,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ "Inportatzailea ez dago prest.\n"
 #~ "5 segundo itxaroten berriro saiatzeko."
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Evolution-en Inportatzeko laguntzailea"
-
 #, fuzzy
 #~ msgid "_Preferences..."
 #~ msgstr "Egutegi-hobespenak"
@@ -28249,9 +29080,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Command"
 #~ msgstr "Enpresakoa"
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolution-en berri-editorea"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "Ziur zaude kontu berri hau ezabatu nahi duzula?"
 
@@ -28265,9 +29093,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "News Servers"
 #~ msgstr "Be_rri-iturriak"
 
-#~ msgid "Source"
-#~ msgstr "Iturburua"
-
 #~ msgid "Source Information"
 #~ msgstr "Iturburu-informazioa"
 
@@ -28331,9 +29156,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ "Aztarna opakoaren informazio baliogabea:\n"
 #~ "%s"
 
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Evolution-en egutegiaren laneko laburpenaren osagaia."
-
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "Egutegi-laburpenaren osagaiaren fabrika."
 
@@ -28452,10 +29274,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgstr "Editatu"
 
 #, fuzzy
-#~ msgid " New "
-#~ msgstr "Berria"
-
-#, fuzzy
 #~ msgid "Advanced Options"
 #~ msgstr "Utzi bertan behera eragiketa"
 
@@ -28520,9 +29338,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "LDAP zerbitzariarekin konektatu zain..."
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Editatu helbide-liburua"
-
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "Zerbitzariarekin a_utentifikatzeko erabili:"
 
@@ -28834,9 +29649,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Summary Settings"
 #~ msgstr "Laburpen-ezarpenak:"
 
-#~ msgid "Factory for the Evolution notes component."
-#~ msgstr "Evolution-en ohar-osagairako fabrika."
-
 #~ msgid "Factory for the Notes control"
 #~ msgstr "Ohar-kontrolerako fabrika."
 
@@ -28903,9 +29715,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Back"
 #~ msgstr "Atzera"
 
-#~ msgid "New List"
-#~ msgstr "Zerrenda berria"
-
 #~ msgid "New Appointment"
 #~ msgstr "Hitzordu berria"
 
@@ -29271,9 +30080,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Regions"
 #~ msgstr "Eskualdeak"
 
-#~ msgid "Al_l stations:"
-#~ msgstr "Estazio _guztiak:"
-
 #~ msgid "All _folders:"
 #~ msgstr "Kar_peta guztiak:"
 
diff --git a/po/fi.po b/po/fi.po
index 3a337b7bd5..537acc39a2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2003-04-06 21:09+0300\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-04-06 20:59+0300\n"
 "Last-Translator: Sami Pesonen <sampeson@iki.fi>\n"
 "Language-Team: Gnome Finnish Translation Team <laatu@gnome-fi.org>\n"
@@ -15,19 +15,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr ""
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolutionin asennus"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "Imports LDIF files into Evolution."
+msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr ""
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Imports VCard files into Evolution."
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
@@ -198,14 +205,14 @@ msgid "TTY"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:482
+#: addressbook/gui/component/e-address-popup.c:488
 #: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Sähköposti 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:492
+#: addressbook/gui/component/e-address-popup.c:498
 #: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
@@ -507,74 +514,72 @@ msgstr ""
 msgid "Error performing search"
 msgstr "Virhe kortin poistossa"
 
-#: addressbook/conduit/address-conduit.c:296
+#: addressbook/conduit/address-conduit.c:294
 #, fuzzy
 msgid "Default Sync Address:"
 msgstr "Sähköpostiosoite:"
 
-#: addressbook/conduit/address-conduit.c:539
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Kohdistimen lataaminen epäonnistui\n"
 
-#: addressbook/conduit/address-conduit.c:552
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1378
-#: calendar/conduits/calendar/calendar-conduit.c:1344
-#: calendar/conduits/todo/todo-conduit.c:886
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1379
-#: calendar/conduits/calendar/calendar-conduit.c:1345
-#: calendar/conduits/todo/todo-conduit.c:887
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1409
-#: addressbook/conduit/address-conduit.c:1412
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
+msgid "Configure access to LDAP directory servers here"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
+msgid "Directory Servers"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Tallenna osoitekirjaan"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
+msgid "Evolution Addressbook LDAP Configuration Control"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
+msgid "Evolution Addressbook address pop-up"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
+msgid "Evolution Addressbook address viewer"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
+msgid "Evolution Addressbook card viewer"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr ""
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Factory for the controls exported by the Evolution Addressbook"
+msgid "Evolution Addressbook folder viewer"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:76
@@ -791,46 +796,46 @@ msgstr ""
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr "(ei nimeä)"
 
-#: addressbook/gui/component/e-address-popup.c:472
+#: addressbook/gui/component/e-address-popup.c:478
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "Ensisijainen sähköposti"
 
-#: addressbook/gui/component/e-address-popup.c:608
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Valitse toiminto"
 
-#: addressbook/gui/component/e-address-popup.c:616
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Luo uusi yhteystieto \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:632
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Lisää osoite olemassaolevaan yhteystietoon \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:908
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:992
+#: addressbook/gui/component/e-address-popup.c:998
 #: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1022
+#: addressbook/gui/component/e-address-popup.c:1028
 #: addressbook/gui/component/e-address-widget.c:428
-#: addressbook/gui/component/select-names/e-select-names-popup.c:429
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Lisää yhteystietoihin"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr ""
 
@@ -961,7 +966,7 @@ msgid "LDAP Configuration Assistant"
 msgstr "Palvelimen asetukset"
 
 #: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "Joka"
@@ -987,8 +992,8 @@ msgstr "_Etsi viestiä"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:35
-#: calendar/gui/calendar-model.c:1975 calendar/gui/e-day-view.c:1683
-#: calendar/gui/e-week-view.c:1229
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 #, fuzzy
 msgid "Searching"
 msgstr "Etsitään..."
@@ -1238,50 +1243,37 @@ msgid "searching-tab"
 msgstr "Etsitään..."
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr ""
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+msgid "Evolution Addressbook name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:201
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
 msgid "Remove All"
 msgstr "Poista kaikki"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-#: addressbook/gui/component/select-names/e-select-names.c:693
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
 #: composer/e-msg-composer-attachment-bar.c:502
 #: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Poista"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
-#: addressbook/gui/component/select-names/e-select-names-popup.c:352
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact Info"
 msgstr "Uusi yhteystieto"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:222
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
 msgid "Send HTML Mail?"
 msgstr "Lähetä HTML-postia?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:370
-msgid "Unnamed Contact List"
-msgstr "Nimetön yhteystietoluettelo"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:387
-#, c-format
-msgid "(%d not shown)"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:450
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr "Nimetön yhteystieto"
 
@@ -1290,11 +1282,11 @@ msgstr "Nimetön yhteystieto"
 msgid "Source"
 msgstr "Lähde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:506
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:649
+#: addressbook/gui/component/select-names/e-select-names.c:648
 msgid "Find contact in"
 msgstr "Etsi yhteystieto"
 
@@ -1425,7 +1417,7 @@ msgstr "Haluaa sähköpostit HTML-muodossa"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: calendar/gui/dialogs/alarm-page.glade.h:10
 #: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3575
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
 #: filter/filter.glade.h:15 mail/folder-browser.c:1783
 #: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
 #: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
@@ -1464,8 +1456,8 @@ msgstr "_Kotisivun osoite:"
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
-#: addressbook/gui/widgets/e-minicard-label.c:151
-#: addressbook/gui/widgets/e-minicard-view-widget.c:118
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:473
 #: addressbook/gui/widgets/e-minicard.c:183
 #, fuzzy
@@ -2501,7 +2493,7 @@ msgstr "Zimbabwe"
 #: addressbook/gui/widgets/e-addressbook-model.c:304
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:104
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:459
 msgid "Book"
 msgstr "Kirja"
@@ -2808,7 +2800,7 @@ msgstr "%d korttia"
 #: addressbook/gui/widgets/e-addressbook-model.c:311
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:111
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:466
 #, fuzzy
 msgid "Query"
@@ -2826,20 +2818,21 @@ msgstr "Matkapuhelin"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
 #: addressbook/gui/widgets/e-addressbook-util.c:105
-#: addressbook/gui/widgets/e-minicard.c:536
+#: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:522 shell/e-shell.c:2072
-#: shell/e-storage.c:602 shell/evolution-shell-component.c:1202
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -2848,7 +2841,7 @@ msgid "Repository offline"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr ""
 
@@ -2865,7 +2858,7 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1176
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
 #: camel/camel-service.c:737 camel/camel-service.c:779
@@ -3068,7 +3061,7 @@ msgid "Delete"
 msgstr "Poista"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:904
-#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 #, fuzzy
 msgid "Current View"
 msgstr "_Nykyinen näkymä"
@@ -3170,42 +3163,42 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr "Tallenna osoitekirjaan"
 
-#: addressbook/gui/widgets/e-minicard-label.c:102
+#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:146
 #, fuzzy
 msgid "Width"
 msgstr "Leveys:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:109
+#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:153
 #, fuzzy
 msgid "Height"
 msgstr "Korkeus:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:116
+#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:161
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:123
+#: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
 msgstr "_Kopio-kenttä"
 
-#: addressbook/gui/widgets/e-minicard-label.c:130
+#: addressbook/gui/widgets/e-minicard-label.c:143
 #, fuzzy
 msgid "Field Name"
 msgstr "Sukunimi"
 
-#: addressbook/gui/widgets/e-minicard-label.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 #, fuzzy
 msgid "Column Width"
 msgstr "Kolumbia"
@@ -3566,7 +3559,7 @@ msgid "High"
 msgstr "Korkea"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/calendar-model.c:1704
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
@@ -3585,73 +3578,73 @@ msgstr "Matala"
 msgid "Undefined"
 msgstr "Määrittelemätön"
 
-#: calendar/conduits/calendar/calendar-conduit.c:208
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1291
-#: calendar/conduits/todo/todo-conduit.c:832
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1442
-#: calendar/conduits/calendar/calendar-conduit.c:1445
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:208
+#: calendar/conduits/todo/todo-conduit.c:206
 #, fuzzy
 msgid "Default Priority:"
 msgstr "_Prioriteetti:"
 
-#: calendar/conduits/todo/todo-conduit.c:956
-#: calendar/conduits/todo/todo-conduit.c:959
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr ""
+msgid "Calendar and Tasks"
+msgstr "Kalenteri ja tehtävät"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
+msgid "Configure your timezone, Calendar and Task List here "
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr ""
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
+msgid "Evolution Calendar configuration control"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
+msgid "Evolution Calendar scheduling message viewer"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr ""
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 #, fuzzy
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolutionin tilimuokkain"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr ""
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:2
-msgid "Factory for the alarm notification service"
+msgid "Evolution Calendar alarm notification service"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
@@ -3760,7 +3753,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
-#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:322
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3778,7 +3771,7 @@ msgstr "%d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:432
-#: calendar/gui/e-week-view-main-item.c:330 calendar/gui/print.c:1513
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3886,12 +3879,12 @@ msgstr "Koko _päivän tapaaminen"
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:956
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
 #: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Henkilökohtainen"
 
-#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:958
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
 #: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Luottamuksellinen"
@@ -3916,38 +3909,38 @@ msgstr "I"
 msgid "W"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1126
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
 #: calendar/gui/e-calendar-table.c:445
 #, fuzzy
 msgid "Free"
 msgstr "Pe"
 
 #: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
-#: calendar/gui/e-meeting-time-sel.c:408
-#: shell/evolution-shell-component.c:1187
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:742 calendar/gui/calendar-model.c:1170
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1172
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1174
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1028
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3955,32 +3948,32 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1168 calendar/gui/dialogs/meeting-page.c:322
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2051
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
 #: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
 #: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
 #: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
 #: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
 #: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr "Kyllä"
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
 #: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Ei"
@@ -4033,25 +4026,25 @@ msgstr "URI jonka kalenteri näyttää"
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:486
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:495
+#: calendar/gui/dialogs/alarm-options.c:429
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Vastaanottajat"
 
-#: calendar/gui/dialogs/alarm-options.c:504
+#: calendar/gui/dialogs/alarm-options.c:438
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Näytä asetukset"
 
-#: calendar/gui/dialogs/alarm-options.c:513
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:522
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -4096,15 +4089,20 @@ msgid "days"
 msgstr "päivää"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 #, fuzzy
 msgid "extra times every"
 msgstr "Päivitä joka"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12 filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "tuntia"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minuutti"
 
@@ -4173,7 +4171,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "tunti(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "minuutti"
 
@@ -4370,7 +4368,7 @@ msgid "_Fri"
 msgstr "Pe"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_General"
 msgstr "Yleiset"
@@ -4561,7 +4559,7 @@ msgstr "Ei kuvausta"
 
 #: calendar/gui/dialogs/comp-editor.c:1230
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
-#: calendar/gui/e-week-view.c:3776 composer/e-msg-composer.c:1159
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
@@ -4657,20 +4655,20 @@ msgstr "Varjostus"
 msgid "Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/dialogs/event-page.c:654 calendar/gui/dialogs/task-page.c:554
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:664
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:687
+#: calendar/gui/dialogs/event-page.c:633
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "_Alkamisaika:"
 
-#: calendar/gui/dialogs/event-page.c:694
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr ""
 
@@ -4733,15 +4731,10 @@ msgid "Su_mmary:"
 msgstr "K_uvaus:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Yhteystiedot..."
-
-#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
@@ -4828,7 +4821,7 @@ msgid "_Change Organizer"
 msgstr "Organisoija:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr ""
 
@@ -5042,6 +5035,10 @@ msgstr "Kuvaus:"
 msgid "Sta_rt Date:"
 msgstr "_Alkamispäivä:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Yhteystiedot..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
@@ -5140,57 +5137,68 @@ msgid "%s for an unknown trigger type"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:415
+#, c-format
 msgid "0%"
 msgstr "0%"
 
 #: calendar/gui/e-calendar-table.c:416
+#, c-format
 msgid "10%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:417
+#, c-format
 msgid "20%"
 msgstr "20%"
 
 #: calendar/gui/e-calendar-table.c:418
+#, c-format
 msgid "30%"
 msgstr "30%"
 
 #: calendar/gui/e-calendar-table.c:419
+#, c-format
 msgid "40%"
 msgstr "40%"
 
 #: calendar/gui/e-calendar-table.c:420
+#, c-format
 msgid "50%"
 msgstr "50%"
 
 #: calendar/gui/e-calendar-table.c:421
+#, c-format
 msgid "60%"
 msgstr "60%"
 
 #: calendar/gui/e-calendar-table.c:422
+#, c-format
 msgid "70%"
 msgstr "70%"
 
 #: calendar/gui/e-calendar-table.c:423
+#, c-format
 msgid "80%"
 msgstr "80%"
 
 #: calendar/gui/e-calendar-table.c:424
+#, c-format
 msgid "90%"
 msgstr "90%"
 
 #: calendar/gui/e-calendar-table.c:425
+#, c-format
 msgid "100%"
 msgstr "100%"
 
 #: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
-#: calendar/gui/e-week-view.c:1906
+#: calendar/gui/e-week-view.c:1910
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Poista valitut kontaktit"
 
 #: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
-#: calendar/gui/e-week-view.c:3557 mail/folder-browser.c:1756
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
 #: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Avaa"
@@ -5201,7 +5209,7 @@ msgid "_Save as..."
 msgstr "Tallenna nimellä..."
 
 #: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
-#: calendar/gui/e-week-view.c:3532 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
@@ -5209,21 +5217,21 @@ msgid "_Print..."
 msgstr "T_ulosta..."
 
 #: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
-#: calendar/gui/e-week-view.c:3564 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
 #: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
-#: calendar/gui/e-week-view.c:3565 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopioi"
 
 #: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
-#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3536
-#: calendar/gui/e-week-view.c:3566 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5253,7 +5261,7 @@ msgid "_Delete Selected Tasks"
 msgstr "Poista tehtävä"
 
 #: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
-#: calendar/gui/e-week-view.c:4265
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr ""
 
@@ -5296,7 +5304,7 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:56 shell/e-shell.c:747
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Kuvaus"
@@ -5336,14 +5344,14 @@ msgstr ""
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
-#: calendar/gui/e-week-view-main-item.c:313 calendar/gui/print.c:1529
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
-#: calendar/gui/e-week-view-main-item.c:336
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -5363,16 +5371,16 @@ msgstr "pm"
 msgid "New _Appointment"
 msgstr "Uusi t_apaaminen"
 
-#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3527
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 #, fuzzy
 msgid "New Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3528
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "Uusi tehtävä"
 
@@ -5380,50 +5388,50 @@ msgstr "Uusi tehtävä"
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3543
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "Siirry _päivään..."
 
-#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3547
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3551
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
 #: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Sähköpostiasetukset..."
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
 #: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
 
-#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3570
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Varjostus"
 
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3576
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3577
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3578
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr ""
 
@@ -5601,7 +5609,7 @@ msgstr "Päivitä"
 #: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
 #: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
 #: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
-#: shell/e-shell.c:2062 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -5633,7 +5641,7 @@ msgid "Send Latest Information"
 msgstr "Tiedoksi"
 
 #: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
-#: shell/evolution-shell-component.c:1165 ui/evolution-mail-global.xml.h:1
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -6016,7 +6024,7 @@ msgid "Needs Action"
 msgstr "Lisää toiminto"
 
 #: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
-#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:407
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr ""
 
@@ -6034,14 +6042,14 @@ msgstr "Ammatti"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2085
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:189
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
 #: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -6053,63 +6061,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:409 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:410
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:535
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:549
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:630
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr ""
 
@@ -6156,7 +6164,7 @@ msgstr "Poista valitut kontaktit"
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3525
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
@@ -6314,7 +6322,7 @@ msgstr "Lähteen tiedot"
 msgid "iCalendar information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6415,7 +6423,7 @@ msgstr "Yhteystiedot: "
 
 #: calendar/gui/print.c:2533 calendar/gui/print.c:2619
 #: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:617
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
@@ -6454,15 +6462,25 @@ msgid "SMTWTFS"
 msgstr "SMTKTPL"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
+msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr ""
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Evolution"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-msgid "Imports vCalendar files into Evolution"
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Evolution"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+msgid "iCalendar files (.ics)"
+msgstr ""
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
 msgstr ""
 
 #: calendar/importers/icalendar-importer.c:404
@@ -10021,7 +10039,7 @@ msgid ""
 "Error sending password: %s"
 msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:623
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
@@ -10489,12 +10507,12 @@ msgstr "Kuvaus:"
 msgid "Attach file(s)"
 msgstr "Liitä tiedosto(t)"
 
-#: composer/e-msg-composer.c:530
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Allekirjoitustiedoston luonti epäonnistui."
 
-#: composer/e-msg-composer.c:809
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10503,51 +10521,51 @@ msgstr ""
 "Tiedoston %s lukeminen epäonnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1213
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1251
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1259
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1266
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1273
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1282
+#: composer/e-msg-composer.c:1285
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1291
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10556,7 +10574,7 @@ msgstr ""
 "Virhe tallennettaessa tiedostoa automaattisesti: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1385
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10564,7 +10582,7 @@ msgstr ""
 "Ximian Evolution on löytänyt tallentamattomia tiedostoja edelliseltä \n"
 "istunnolta. Haluatko koettaa niiden palauttamista?"
 
-#: composer/e-msg-composer.c:1547
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10575,39 +10593,39 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:1552
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: composer/e-msg-composer.c:1556
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Varoitus: Muutettu viesti"
 
-#: composer/e-msg-composer.c:1588
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:2012
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Signature:"
 msgstr "Tallenna allekirjoitus"
 
-#: composer/e-msg-composer.c:2052 mail/mail-account-gui.c:1254
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2908
-#: composer/e-msg-composer.c:2909
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:2940
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2966
+#: composer/e-msg-composer.c:2931
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10618,7 +10636,7 @@ msgstr ""
 "Viestimuokkain -ikkunan luominen epäonnistui:\n"
 "HTML-muokkainkomponentin käynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:3026
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10626,7 +10644,7 @@ msgstr ""
 "Viestimuokkain -ikkunan luominen epäonnistui:\n"
 "HTML-muokkainkomponentin käynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:4039
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11150,7 +11168,7 @@ msgstr ""
 msgid "months"
 msgstr "kuukautta"
 
-#: filter/filter.glade.h:24 mail/mail-config.glade.h:181
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -11503,7 +11521,7 @@ msgid "Scanning %s"
 msgstr ""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:114
+#: importers/pine-importer.c:637 mail/component-factory.c:116
 #: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
 #: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
@@ -11630,56 +11648,60 @@ msgid "Composer Preferences"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configuration control for the Evolution Mailer."
+msgid "Configure the fonts used by Evolution here"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
+msgid "Configure your email accounts here"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolutionin tilimuokkain"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Configure the fonts used by Evolution here"
-msgstr ""
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Configure your email accounts here"
-msgstr ""
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
+msgid "Evolution Mail composer configuration control"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
+msgid "Evolution Mail configuration interface"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
+msgid "Evolution Mail folder viewer"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
+msgid "Evolution Mail font configuration control"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "Factory for the controls exported by the Evolution Mailer"
+msgid "Evolution Mail preferences control"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
@@ -11695,52 +11717,48 @@ msgstr "Tilit"
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr ""
-
-#: mail/component-factory.c:114
+#: mail/component-factory.c:116
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "Julkinen"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:144
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Tämä kansio ei voi sisältää viestejä."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Ominaisuudet..."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Muuta tämän kansion ominaisuuksia"
 
-#: mail/component-factory.c:816
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:996
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr ""
 
@@ -11986,22 +12004,38 @@ msgstr "_Oletukset"
 msgid "Getting Folder Information"
 msgstr "Valinnaiset tiedot"
 
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr ""
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolutionin tilimuokkain"
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "Imports mbox files into Evolution"
+msgid "MBox (mbox)"
 msgstr ""
 
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr ""
@@ -12043,7 +12077,7 @@ msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Isäntäpalvelin:"
 
@@ -12052,7 +12086,7 @@ msgstr "_Isäntäpalvelin:"
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_Polku:"
 
@@ -12069,12 +12103,12 @@ msgid "Don't delete"
 msgstr "Älä poista"
 
 #: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr "Älä käytä"
 
 #: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr "Käytä"
 
@@ -12085,7 +12119,7 @@ msgid "[Default]"
 msgstr "_Oletukset"
 
 #: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:680 mail/mail-composer-prefs.c:836
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr "Käytä"
 
@@ -12322,35 +12356,35 @@ msgstr "Tulosta viesti"
 msgid "Printing of message failed"
 msgstr "Viestin tulostus epäonnistui"
 
-#: mail/mail-callbacks.c:3146
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:225 mail/mail-composer-prefs.c:328
-#: mail/mail-config.c:1220
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
 #, fuzzy
 msgid "Unnamed"
 msgstr "Nimetön kontakti"
 
-#: mail/mail-composer-prefs.c:313
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr "Määrittele kelvollinen komentotiedoston nimi."
 
-#: mail/mail-composer-prefs.c:369 mail/mail-composer-prefs.c:431
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
 msgid "[script]"
 msgstr "[komentotiedosto]"
 
-#: mail/mail-composer-prefs.c:840
+#: mail/mail-composer-prefs.c:864
 #, fuzzy
 msgid "Language(s)"
 msgstr "Lataa k_uvat"
 
-#: mail/mail-composer-prefs.c:882
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Lisää allekirjoituskomentotiedosto"
 
-#: mail/mail-composer-prefs.c:902
+#: mail/mail-composer-prefs.c:926
 #, fuzzy
 msgid "Signature(s)"
 msgstr "_HTML-allekirjoitus:"
@@ -12405,11 +12439,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:924
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1002 mail/mail-config.c:1006
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12668,23 +12702,24 @@ msgid "Message Display"
 msgstr "Viestit"
 
 #: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Viesti sisältää"
+
+#: mail/mail-config.glade.h:76
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
-msgid "On Screen fonts"
-msgstr ""
-
 #: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
@@ -12932,114 +12967,120 @@ msgid "_Enable"
 msgstr "Käytä"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "_Välitä tyyli:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Koko nimi:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Lähetä HTML-postia?"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Tee tästä _oletustilini"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Vastaa kaikille"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Komentotiedosto:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Lähtevä posti"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Näytä"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML-allekirjoitus:"
 
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "San Marino"
+
 #: mail/mail-config.glade.h:175
 #, fuzzy
+msgid "_Terminal Font:"
+msgstr "Alkuperäinen yhteystieto:"
+
+#: mail/mail-config.glade.h:176
+#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Käytä salattua yhteyttä (_SSL)"
 
-#: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
+#: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_every"
 msgstr "Joka"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "color"
 msgstr " "
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "description"
 msgstr "Kuvaus:"
@@ -13667,31 +13708,31 @@ msgstr "Korkeampi"
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:1076
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "Tänään %l:%M %p"
 
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1112
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1114
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2610
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -13791,41 +13832,41 @@ msgstr ""
 msgid "_Flag:"
 msgstr "Tiedostonimi:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:331
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1246 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Kansio"
 
-#: mail/subscribe-dialog.c:1356
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Tallenna kansioon..."
 
-#: mail/subscribe-dialog.c:1470
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: mail/subscribe-dialog.c:1545
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
@@ -13862,20 +13903,26 @@ msgid "_Unsubscribe"
 msgstr "Poista tilaus"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configuration control for the Evolution Summary."
+msgid "Configure the appearance of the Evolution Summary here"
 msgstr ""
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
-msgid "Configure the appearance of the Evolution Summary here"
-msgstr ""
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
 #, fuzzy
-msgid "Evolution Summary component."
+msgid "Evolution Summary component"
 msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
 #, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
+#, fuzzy
 msgid "Summary Preferences"
 msgstr "Yhteenveto sisältää"
 
@@ -24477,17 +24524,17 @@ msgstr ""
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:524
+#: my-evolution/e-summary.c:523
 #, fuzzy
 msgid "Please wait..."
 msgstr "Odota, ole hyvä"
 
-#: my-evolution/e-summary.c:590 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
 msgstr "Kuvaus"
 
-#: my-evolution/e-summary.c:624
+#: my-evolution/e-summary.c:623
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Viestin tulostus epäonnistui"
@@ -25775,22 +25822,23 @@ msgid "_Weather"
 msgstr "_Säätiedot"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
+msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution-kuori."
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 #, fuzzy
 msgid "Folder Settings"
 msgstr "Asetukset"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "Evolution-kuori."
-
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Näytä yksityiskohdat"
@@ -25858,33 +25906,7 @@ msgid ""
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:243
-#, fuzzy, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Hakemistoa %s ei voitu luoda:\n"
-"%s"
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:267
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:290
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25892,7 +25914,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:299
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -26037,7 +26059,7 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Luo _uusi kansio"
 
-#: shell/e-shell-folder-title-bar.c:593 shell/e-shell-folder-title-bar.c:594
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Nimetön)"
 
@@ -26343,12 +26365,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:738
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1799
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26356,19 +26378,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2064
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2066
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2068
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2070 shell/e-storage.c:572
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -26600,69 +26622,69 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA-virhe"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1171
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1190
 #, fuzzy
 msgid "No owner"
 msgstr "Määrittelemätön"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1179
+#: shell/evolution-shell-component.c:1194
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Tar_kista tuetut tavat"
 
-#: shell/evolution-shell-component.c:1181
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1183
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1185
+#: shell/evolution-shell-component.c:1200
 #, fuzzy
 msgid "Internal error"
 msgstr "I/O-virhe"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1204
 #, fuzzy
 msgid "Exists"
 msgstr "_Poistu"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1210
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Luonnoskansio:"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1212
 #, fuzzy
 msgid "No space left"
 msgstr "Ei viestejä valittuna"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr ""
 
@@ -26684,10 +26706,6 @@ msgstr ""
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "dialog1"
-msgstr ""
-
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
 msgstr "_Kalenteri"
@@ -26827,17 +26845,17 @@ msgstr "Älä kysy tätä enää uudelleen"
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:110 shell/main.c:556
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:116
+#: shell/main.c:118
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolutionin aseukseni"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:264
+#: shell/main.c:266
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26857,7 +26875,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:288
+#: shell/main.c:290
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -26866,43 +26884,47 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:296
+#: shell/main.c:298
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Älä kysy tätä enää uudelleen"
 
-#: shell/main.c:385
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:394
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolutionin kuoren alustus epäonnistui: %s"
 
-#: shell/main.c:526
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:528
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Aloita uudelta sivulta"
 
-#: shell/main.c:530
+#: shell/main.c:532
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Aloita uudelta sivulta"
 
-#: shell/main.c:532
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr ""
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:535
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:560
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26910,7 +26932,6 @@ msgid ""
 msgstr ""
 
 #: tools/evolution-addressbook-abuse.c:81
-#: tools/evolution-addressbook-export.c:41
 #: tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
@@ -26922,11 +26943,6 @@ msgstr "Virhe avattaessa tiedostoa: %s"
 msgid "Input File"
 msgstr "Liitä tiedosto"
 
-#: tools/evolution-addressbook-export.c:51
-#, fuzzy
-msgid "Output File"
-msgstr "Avaa tiedosto"
-
 #: tools/evolution-addressbook-import.c:82
 #, fuzzy
 msgid "No filename provided."
@@ -26957,6 +26973,21 @@ msgstr ""
 msgid "Default subject for the message."
 msgstr ""
 
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr ""
+"Tiedoston %s poistaminen epäonnistui:\n"
+"%s"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopioi yhteystiedot toiseen kansioon..."
@@ -28688,43 +28719,61 @@ msgstr "Etsi nyt"
 msgid "_Clear"
 msgstr "Kalenteri"
 
-#: widgets/misc/e-search-bar.c:839
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:846
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:853
+#: widgets/misc/e-search-bar.c:847
 #, fuzzy
 msgid "Text"
 msgstr "Seuraava"
 
-#: widgets/misc/e-search-bar.c:931
+#: widgets/misc/e-search-bar.c:925
 #, fuzzy
 msgid "Clear"
 msgstr "Kalenteri"
 
-#: widgets/misc/e-search-bar.c:933
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Etsi nyt"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "The Personal Addressbook Server"
+msgid "Evolution Addressbook local/LDAP backend"
 msgstr ""
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
 #: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
+msgid "Evolution Calendar local file backend"
 msgstr ""
 
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:3
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:3
-msgid "Wombat InterfaceCheck interface"
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+msgid "Evolution Addressbook local file backend"
 msgstr ""
 
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Nimetön yhteystietoluettelo"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hakemistoa %s ei voitu luoda:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Output File"
+#~ msgstr "Avaa tiedosto"
+
 #~ msgid "380"
 #~ msgstr "380"
 
@@ -28759,10 +28808,6 @@ msgstr ""
 #~ msgstr "_Muokkaa tapaamista"
 
 #, fuzzy
-#~ msgid "_Evolution attribute:"
-#~ msgstr "Evolution"
-
-#, fuzzy
 #~ msgid "_More Options >>"
 #~ msgstr "_Asetukset"
 
diff --git a/po/fr.po b/po/fr.po
index a4e2a78e94..cabae2c7a3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1.0.99\n"
-"POT-Creation-Date: 2002-11-27 17:30+0100\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2002-11-27 11:17+0100\n"
 "Last-Translator: Joaquim Fellmann <joaquim@altern.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -17,27 +17,52 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Assistant d'importation"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Éditeur de courrier d'Evolution"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Éditeur de courrier d'Evolution"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/backend/ebook/e-card.c:1297
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Classer comme"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/backend/ebook/e-card.c:1311
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nom"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/backend/ebook/e-card.c:1338
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1850
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Principal"
 
@@ -47,17 +72,17 @@ msgstr "Prin."
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1400
-#: addressbook/gui/contact-editor/e-contact-editor.c:1835
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Adjoint"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
-#: addressbook/gui/contact-editor/e-contact-editor.c:1907
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Profession"
 
@@ -67,12 +92,12 @@ msgid "Bus"
 msgstr "Prof."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1839
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Répondeur"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1841
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Société"
 
@@ -83,13 +108,13 @@ msgstr "Soc."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1842
-#: addressbook/gui/contact-editor/e-contact-editor.c:1908
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Maison"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1358
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisation"
@@ -100,18 +125,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1846
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Mobile"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1840
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "Voiture"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1838
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax professionnel"
@@ -121,13 +146,13 @@ msgid "Bus Fax"
 msgstr "Fax prof."
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1844
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax maison"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1837
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Travail 2"
 
@@ -136,43 +161,43 @@ msgid "Bus 2"
 msgstr "Prof. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1843
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Maison 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1845
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "RNIS"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1847
-#: addressbook/gui/contact-editor/e-contact-editor.c:1909
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Autre"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1848
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Fax Autre"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1849
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1851
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1852
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
@@ -183,15 +208,15 @@ msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1880
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1881
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-mail 3"
@@ -215,7 +240,7 @@ msgid "Dep"
 msgstr "Serv"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1372
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Bureau"
@@ -225,7 +250,7 @@ msgid "Off"
 msgstr "Bur."
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1379
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Titre"
@@ -240,7 +265,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1393
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Directeur"
@@ -254,7 +279,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1407
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Surnom"
@@ -264,19 +289,19 @@ msgid "Nick"
 msgstr "Snom"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1414
+#: addressbook/backend/ebook/e-card.c:1418
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Conjoint(e)"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1448
+#: addressbook/backend/ebook/e-card.c:1459
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Note"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1434
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "URI du Calendrier"
 
@@ -294,287 +319,337 @@ msgid "FBUrl"
 msgstr "FBUrl"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
-#: addressbook/backend/ebook/e-card.c:1421
+msgid "Default server calendar"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "Calendrier"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "Anniversaire"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Anniv"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Date de naissance"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
-#: addressbook/backend/ebook/e-card.c:1462
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Catégories"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Nom de famille"
 
-#: addressbook/backend/ebook/e-card-simple.c:334
+#: addressbook/backend/ebook/e-card-simple.c:335
 #, fuzzy
 msgid "ECard"
 msgstr "Voiture"
 
-#: addressbook/backend/ebook/e-card-simple.c:829
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:890
-#: addressbook/backend/ebook/e-destination.c:704
+#: addressbook/backend/ebook/e-card-simple.c:893
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Liste de Contacts Sans Nom"
 
-#: addressbook/backend/ebook/e-card.c:1304
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:330
+#: addressbook/backend/ebook/e-card.c:1308
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: addressbook/backend/ebook/e-card.c:1317
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:94
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #, fuzzy
 msgid "Address"
 msgstr "A_dresse :"
 
-#: addressbook/backend/ebook/e-card.c:1324
+#: addressbook/backend/ebook/e-card.c:1328
 #, fuzzy
 msgid "Address Label"
 msgstr "Cartes _Adresse"
 
-#: addressbook/backend/ebook/e-card.c:1331
+#: addressbook/backend/ebook/e-card.c:1335
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/backend/ebook/e-card.c:1345
+#: addressbook/backend/ebook/e-card.c:1349
 #, fuzzy
 msgid "Birth date"
 msgstr "Date de naissance"
 
-#: addressbook/backend/ebook/e-card.c:1351
+#: addressbook/backend/ebook/e-card.c:1355
 #: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
-#: addressbook/backend/ebook/e-card.c:1365
+#: addressbook/backend/ebook/e-card.c:1369
 #, fuzzy
 msgid "Organizational Unit"
 msgstr "Organisation"
 
-#: addressbook/backend/ebook/e-card.c:1386
+#: addressbook/backend/ebook/e-card.c:1390
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rôle"
 
-#: addressbook/backend/ebook/e-card.c:1427 mail/mail-format.c:945
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
 msgid "Mailer"
 msgstr "Logiciel de messagerie"
 
-#: addressbook/backend/ebook/e-card.c:1441
+#: addressbook/backend/ebook/e-card.c:1445
 #, fuzzy
 msgid "Free/Busy URL"
 msgstr "URL Lib_re/-Occupé :"
 
-#: addressbook/backend/ebook/e-card.c:1455
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Calendrier"
+
+#: addressbook/backend/ebook/e-card.c:1466
 #, fuzzy
 msgid "Related Contacts"
 msgstr "Contacts Sélectionnés : "
 
-#: addressbook/backend/ebook/e-card.c:1469
+#: addressbook/backend/ebook/e-card.c:1480
 #, fuzzy
 msgid "Category List"
 msgstr "La catégorie est"
 
-#: addressbook/backend/ebook/e-card.c:1476
+#: addressbook/backend/ebook/e-card.c:1487
 msgid "Wants HTML"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1483
+#: addressbook/backend/ebook/e-card.c:1494
 msgid "Wants HTML set"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1490
+#: addressbook/backend/ebook/e-card.c:1501
 #, fuzzy
 msgid "List"
 msgstr "Lista"
 
-#: addressbook/backend/ebook/e-card.c:1497
+#: addressbook/backend/ebook/e-card.c:1508
 #, fuzzy
 msgid "List Show Addresses"
 msgstr "Autre adresse"
 
-#: addressbook/backend/ebook/e-card.c:1504
+#: addressbook/backend/ebook/e-card.c:1515
 #, fuzzy
 msgid "Arbitrary"
 msgstr "Amritsar"
 
-#: addressbook/backend/ebook/e-card.c:1511
+#: addressbook/backend/ebook/e-card.c:1522
 #, fuzzy
 msgid "ID"
 msgstr "I"
 
-#: addressbook/backend/ebook/e-card.c:1518
+#: addressbook/backend/ebook/e-card.c:1529
 #, fuzzy
 msgid "Last Use"
 msgstr "Coller"
 
-#: addressbook/backend/ebook/e-card.c:1529
+#: addressbook/backend/ebook/e-card.c:1540
 #, fuzzy
 msgid "Use Score"
 msgstr "Score"
 
-#: addressbook/backend/ebook/e-card.c:2870
-msgid "Multiple VCards"
-msgstr "Multiples VCards"
-
-#: addressbook/backend/ebook/e-card.c:2878
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard pour %s"
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:17
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:31
-#: addressbook/conduit/address-conduit.c:1860
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:65
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "Ne peut initialiser Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:361
-#: addressbook/backend/pas/pas-backend-ldap.c:2996
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Recherche..."
 
-#: addressbook/backend/pas/pas-backend-file.c:363
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Chargement"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:705
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "En utilisant le nom distinctif (DN)"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "En utilisant l'adresse électronique"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr "Reconnexion au serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1248
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Ajout de la carte sur le serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1354
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Suppression de la carte du serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1590
-#: addressbook/backend/pas/pas-backend-ldap.c:1593
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "Modification de la carte du serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2907
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Récupération des résultats de recherche LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:3016
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr "Erreur lors de la recherche"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Adresse de synchronisation par défaut :"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Le curseur ne peut être chargé\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook non chargé\n"
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Ne peut démarrer le serveur wombat"
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Ne peut démarrer wombat"
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr "Ne peut lire les données du bloc Adresses du Pilot"
 
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:608
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr "Configurez ici l'accès aux serveurs d'annuaires LDAP"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr "Serveurs d'Annuaires"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Éditer le carnet d'adresses"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Interface de sélection de nom du carnet d'adresses d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Usine à composants pour les popups d'adresse du carnet d'adresse"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Visualisateur de minicard du carnet d'adresses"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Visualisateur de minicard du carnet d'adresses"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Composant Résumé d'Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visualisateur de minicard du carnet d'adresses"
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
 #: calendar/gui/dialogs/comp-editor-util.c:309
 #: calendar/gui/dialogs/comp-editor-util.c:365
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:179
-#: shell/e-shortcuts.c:1087
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
 msgstr "Contacts"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "Dossier contenant les informations de contact"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "Serveur LDAP contenant les inforamtions des contacts"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public Contacts"
 msgstr "Contacts Publics"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public folder containing contact information"
 msgstr "Dossier public contenant des informations de contact"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Contacts"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr "Créer un nouveau contact"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Nouvelle liste de contacts"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "_Liste de Contacts"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr "Créer une nouvelle liste de contacts"
 
-#: addressbook/gui/component/addressbook-config.c:207
+#: addressbook/gui/component/addressbook-config.c:206
 msgid "Failed to connect to LDAP server"
 msgstr "Échec de la connexion au serveur LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:232
+#: addressbook/gui/component/addressbook-config.c:231
 msgid "Failed to authenticate with LDAP server"
 msgstr "Impossible de vous identifier sur le serveur LDAP"
 
@@ -582,40 +657,40 @@ msgstr "Impossible de vous identifier sur le serveur LDAP"
 msgid "Could not perform query on Root DSE"
 msgstr "Impossible d'effectuer la requête sur la racine DSE"
 
-#: addressbook/gui/component/addressbook-config.c:670
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr "Le serveur a retourné une base de recherche non supportée"
 
-#: addressbook/gui/component/addressbook-config.c:1177
+#: addressbook/gui/component/addressbook-config.c:1193
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 "Ce serveur ne supporte pas les informations relatives aux schema LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1199
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr "Erreur lors du rappatriement des informations concernant le schéma"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr "Le serveur a renvoyé des informations invalides concernant le schéma"
 
-#: addressbook/gui/component/addressbook-config.c:1655
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP n'a pas été activé dans cette compilation d'Evolution"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Nom du compte"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Nom du serveur"
 
-#: addressbook/gui/component/addressbook-storage.c:166
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP n'a pas été activé dans cette compilation d'Evolution"
+
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Autres contacts"
 
-#: addressbook/gui/component/addressbook.c:484
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -623,7 +698,7 @@ msgstr ""
 "Nous n'avons pas pu ouvrir ce carnet d'adresse. Veuillez vérifiez\n"
 "que le chemin existe et que vous avez la permission d'accès."
 
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -632,7 +707,7 @@ msgstr ""
 "Nous n'avons pu ouvrir ce carnet d'adresses.  Vous avez\n"
 "saisi un URI incorrect ou le serveur LDAP est injoignable. "
 
-#: addressbook/gui/component/addressbook.c:499
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -644,7 +719,7 @@ msgstr ""
 "devez compiler le programme à partir des sources CVS\n"
 "après voir récupéré OpenLDAP à l'adresse indiquée ci-dessous.\n"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:537
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -653,51 +728,50 @@ msgstr ""
 "Nous n'avons pu ouvrir ce carnet d'adresses. Vous avez\n"
 "saisi un URI incorrect ou le serveur LDAP est injoignable. "
 
-#: addressbook/gui/component/addressbook.c:529
+#: addressbook/gui/component/addressbook.c:557
 msgid "Unable to open addressbook"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:587
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accès anonyme au serveur LDAP"
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:667
 msgid "Failed to authenticate.\n"
 msgstr ""
 "Impossible de vous identifier. \n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:638
-#: addressbook/gui/component/addressbook.c:641
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSaisissez le mot de passe pour %s (utilisateur %s)"
 
-#: addressbook/gui/component/addressbook.c:787
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr "Nom commence par"
 
-#: addressbook/gui/component/addressbook.c:788
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr "Adresse débutant par"
 
-#: addressbook/gui/component/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:52
+#: addressbook/gui/component/addressbook.c:815
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "La catégorie est"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790
-#: calendar/gui/cal-search-bar.c:48
+#: addressbook/gui/component/addressbook.c:816
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Avancée..."
 
-#: addressbook/gui/component/addressbook.c:965
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -705,7 +779,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -718,25 +792,25 @@ msgstr ""
 "temps dans les préférences du serveur d'annuaire de ce carnet \n"
 "d'adresses."
 
-#: addressbook/gui/component/addressbook.c:977
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:980
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:984
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr "Cette requête ne s'est pas terminée correctement. "
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1059
-#: calendar/gui/cal-search-bar.c:379
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr "Toute catégorie"
 
-#: addressbook/gui/component/addressbook.c:1139
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que le navigateur de dossier affichera"
 
@@ -745,55 +819,54 @@ msgstr "L'URI que le navigateur de dossier affichera"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr "(Inconnu)"
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1879
+#: addressbook/gui/component/e-address-popup.c:478
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "E-mail principal"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Sélectionner une action"
 
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Créer un nouveau contact « %s »"
 
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Ajouter une adresse au contact existant « %s »"
 
-#: addressbook/gui/component/e-address-popup.c:889
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Interroger le carnet d'adresses..."
 
-#: addressbook/gui/component/e-address-popup.c:971
-#: addressbook/gui/component/e-address-widget.c:391
-#: addressbook/gui/component/select-names/e-select-names-popup.c:305
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Editer Info Contact"
 
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:427
-#: addressbook/gui/component/select-names/e-select-names-popup.c:484
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Ajouter aux contacts"
 
-#: addressbook/gui/component/e-address-popup.c:1044
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Fusionner l'adresse E-Mail"
 
-#: addressbook/gui/component/e-address-widget.c:368
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Désactiver les interrogations"
 
-#: addressbook/gui/component/e-address-widget.c:368
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Activer les Interrogations (Dangereux!)"
 
@@ -808,8 +881,16 @@ msgid "  S_how Supported Bases "
 msgstr "  Affic_her les Bases Supportées"
 
 #: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1234"
-msgstr "1234"
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:5
 msgid "1:00"
@@ -824,59 +905,36 @@ msgid "3268"
 msgstr "3268"
 
 #: addressbook/gui/component/ldap-config.glade.h:8
-msgid "380"
-msgstr "380"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
-msgid "666"
-msgstr "666"
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "<- _Remove"
-msgstr "<- Supp_rimer"
-
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "<< Fewer Options"
-msgstr "<< Moins d'Options"
-
-#: addressbook/gui/component/ldap-config.glade.h:15
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "Add LDAP Server"
+msgstr "Serveur LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
 msgstr "Sources du carnet d'adresses"
 
-#: addressbook/gui/component/ldap-config.glade.h:17 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Toujours"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr "Anonymement"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
-msgid "Associated LDAP Attribute"
-msgstr "Attribut LDAP Associé"
-
-#: addressbook/gui/component/ldap-config.glade.h:20
-msgid "Attribute"
-msgstr "Attribut"
-
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -890,73 +948,57 @@ msgstr ""
 "Veuillez cliquer sur le bouton « Terminer » pour enregistrer les paramètres\n"
 "que vous avez saisis."
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Connexion"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
-msgid "Corresponding Evolution Attribute"
-msgstr "Attribut Evolution Correspondant"
-
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "DN Customization"
-msgstr "Personnalisation du DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "_Supprimer"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "_Nom _distinctif : "
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "Serveur LDAP"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "Adresse Électronique : "
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-msgid "Evolution Attribute"
-msgstr "Attribut d'Evolution"
-
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution utilisera ce DN pour vous identifier sur le serveur"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution utilisera cette adresse de courrier électronique pour vous "
 "authentifier sur le serveur"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "Terminé"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "Général"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "LDAP Attribute"
-msgstr "Attribut LDAP"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "Assistant de Configuration LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
-#, fuzzy
-msgid "Mappings"
-msgstr "Marges"
-
-#: addressbook/gui/component/ldap-config.glade.h:39 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Jamais"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -973,63 +1015,26 @@ msgstr ""
 "administrateur système si votre serveur\n"
 "LDAP utilise ces protocoles."
 
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:44
-msgid "Objectclasses Used in Evolution:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid "Objectclasses Used on Server:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Un"
 
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:51
-msgid "R_estore Defaults"
-msgstr "R_estaurer les Valeurs par Défaut"
-
-#: addressbook/gui/component/ldap-config.glade.h:52
-msgid "Re_store Defaults"
-msgstr "Re_staurer les Valeurs par Défaut"
-
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Domain_e de recherche : "
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:54
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1684
-#: calendar/gui/e-week-view.c:1207
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 msgid "Searching"
 msgstr "Recherche"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
-#, fuzzy
-msgid "Select"
-msgstr "Sélectionner tout"
-
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Sélectionné : "
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -1039,7 +1044,7 @@ msgstr ""
 "LDAP\n"
 "uniquement si votre serveur LDAP supporte SSL et TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -1057,7 +1062,7 @@ msgstr ""
 "besoin d'utiliser \n"
 "SSL/TLS car votre connection est déjà sécurisée."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1071,7 +1076,7 @@ msgstr ""
 "vulnérable aux\n"
 "problèmes de sécurité."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
@@ -1082,18 +1087,7 @@ msgstr ""
 "par défaut pour les recherches LDAP ainsi que pour créer et éditer des "
 "contacts."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-"Sélectionner cette option vous permettra de changer les paramètres "
-"Evolution \n"
-"par défaut pour les recherches LDAP ainsi que pour créer et éditer des "
-"contacts."
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
@@ -1101,32 +1095,32 @@ msgstr ""
 "Spécifier un nom d'affichage est la dernière étape nécéssaire à la "
 "configuration d'un serveur LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr "Étape 1: Informations sur le serveur"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr "Étape 2: Connexion au Serveur"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr "Étape 3 : Rechercher dans l'Annuaire"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr "Étape 4 : Nom d'Affichage"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Sous"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Schéma non supporté"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1139,7 +1133,7 @@ msgstr ""
 "système si\n"
 "vous n'êtes pas sûr de ces informations."
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1151,7 +1145,7 @@ msgstr ""
 "incluses\n"
 "dans vos recherches et combien de temps une recherche doit prendre. "
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1164,7 +1158,7 @@ msgstr ""
 "racine de \n"
 "l'arborescence de l'annuaire."
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:62
 #, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
@@ -1182,7 +1176,7 @@ msgstr ""
 "trouvant un niveau\n"
 "en dessous de votre base."
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1198,7 +1192,7 @@ msgstr ""
 "spécifiques concernant le serveur. Veuillez contacter votre administrateur\n"
 "système si vous avez besoin d'aide pour trouver ces informations."
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1206,7 +1200,7 @@ msgstr ""
 "Ceci représente le nom complet de votre serveur ldap. Par exemple « ldap."
 "monentreprise.com »."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -1216,7 +1210,7 @@ msgstr ""
 "nombre\n"
 "trop élevé, cela ralentira l'accès à votre carnet d'adresses."
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1226,7 +1220,7 @@ msgstr ""
 "serveur LDAP. Notez bien que spécifiez « Adresse électronique » implique que "
 "l'accès anonyme au serveur soit autorisé."
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -1236,7 +1230,7 @@ msgstr ""
 "dossiers d'Evolution. \n"
 "(dans un but d'affichage uniquement). "
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1248,91 +1242,46 @@ msgstr ""
 "administrateur\n"
 "système le port que vous devez utiliser."
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr "Cette option contrôle le temps d'exécution d'une requête. "
 
-#: addressbook/gui/component/ldap-config.glade.h:104
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-"Pour ajouter un attribut au DN sélectionnez le à partir de la liste et "
-"cliquez sur le bouton\n"
-"« Ajouter un Attribut ». Chaque valeur que vous ajoutez au DN deviendra une "
-"valeur\n"
-"nécéssaire pour tout nouveau contact que vous ajouterez à l'annuaire sur le "
-"serveur LDAP."
-
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr "Utili_ser SSL/TLS : "
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr "En utilisant le nom distinctif (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr "En utilisant l'adresse électronique"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Lorsque c'est possible"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
-msgid "_Add ->"
-msgstr "_Ajouter ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
-msgid "_Add Mapping"
-msgstr "Ajouter l'action"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
-msgid "_Add to DN"
-msgstr "_Ajouter au DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Always"
-msgstr "_Toujours"
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "_Supprimer tout"
-
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Nom pour l'affichage"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
-msgid "_Distinguished Name (DN):"
-msgstr "Nom _Distinctif (DN) : "
-
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_Don't use SSL/TLS"
-msgstr "Ne _pas utiliser SSL/TLS"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid "_Download limit:"
 msgstr "Limite de _téléchargement : "
 
-#: addressbook/gui/component/ldap-config.glade.h:121 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1342,155 +1291,112 @@ msgstr "Limite de _téléchargement : "
 msgid "_Edit"
 msgstr "_Éditer"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "Éditer le rendez-vous"
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "_Evolution attribute:"
-msgstr "Attribut d'Evolution : "
-
-#: addressbook/gui/component/ldap-config.glade.h:124
-msgid "_If necessary "
-msgstr "S_i nécéssaire"
-
-#: addressbook/gui/component/ldap-config.glade.h:125
-msgid "_LDAP attribute:"
-msgstr "Attribut _LDAP : "
-
-#: addressbook/gui/component/ldap-config.glade.h:126
-msgid "_LDAP attributes:"
-msgstr "Attributs _LDAP : "
-
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr "Méthode d'identification : "
 
-#: addressbook/gui/component/ldap-config.glade.h:128
-#, fuzzy
-msgid "_More Options >>"
-msgstr "_Plus d'Options >>"
-
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "Numéro de port : "
 
-#: addressbook/gui/component/ldap-config.glade.h:130
-msgid "_Restore Defaults"
-msgstr "_Restaurer les Valeurs par Défaut"
-
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr "Ba_se de la recherche : "
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "Nom du _serveur :"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "_Temps d'attente maximum (minutes) : "
 
-#: addressbook/gui/component/ldap-config.glade.h:134
-#, fuzzy
-msgid "account-druid"
-msgstr "Compte %d"
-
-#: addressbook/gui/component/ldap-config.glade.h:135
-#, fuzzy
-msgid "account-editor"
-msgstr "Éditeur de compte"
-
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr "cartes"
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Reconnexion à %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:139
-msgid "edit_server_window_simple"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:97
 #, fuzzy
 msgid "general-tab"
 msgstr "Général"
 
-#: addressbook/gui/component/ldap-config.glade.h:141
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:142
-msgid "objectclasses-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:143
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "searching-tab"
 msgstr "Recherche"
 
-#. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:162
-#: addressbook/gui/component/select-names/e-select-names.c:689
-#: composer/e-msg-composer-attachment-bar.c:501
-#: my-evolution/e-summary-shown.c:539 shell/e-shortcuts-view.c:182
-msgid "Remove"
-msgstr "Supprimer"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interface de sélection de nom du carnet d'adresses d'Evolution"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:177
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
 msgid "Remove All"
 msgstr "Supprimer tout"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:201
-msgid "Send HTML Mail?"
-msgstr "Envoyer un courrier en HTML ?"
+#. Fixme: Ditto
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
+msgid "Remove"
+msgstr "Supprimer"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:404
-msgid "Edit Contact List"
-msgstr "Editer la liste de Contacts"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Nouvelle liste de contacts"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:422
-msgid "Unnamed Contact List"
-msgstr "Liste de Contacts sans nom"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "Editer Info Contact"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:439
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d cachés)"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
+msgid "Send HTML Mail?"
+msgstr "Envoyer un courrier en HTML ?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:505
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr "Contact sans nom"
 
-#: addressbook/gui/component/select-names/e-select-names.c:496
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+msgid "Source"
+msgstr "Source"
+
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Sélectionnez les contacts dans le carnet d'adresses"
 
-#: addressbook/gui/component/select-names/e-select-names.c:556
+#: addressbook/gui/component/select-names/e-select-names.c:648
 msgid "Find contact in"
 msgstr "Trouver un contact dans"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Find"
+msgstr "Rechercher : "
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Sélectionnez des noms"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Selected Contacts:"
 msgstr "Contacts Sélectionnés : "
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show Contacts"
 msgstr "Afficher les Contacts"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid ""
 "Type a name into the entry, or\n"
 "select one from the list below:"
@@ -1498,36 +1404,32 @@ msgstr ""
 "Veuillez saisir un nom dans le champ ou\n"
 "sélectionnez en un dans la liste ci-dessous : "
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
 msgstr "_Catégorie :"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "_Dossier :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr "Nom de l'A_ssistant : "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr "Ad_resse..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "Anni_versaire :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr "_Date de naissance :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "C_ontacts..."
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tégories..."
@@ -1538,7 +1440,7 @@ msgstr "Collaboration"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1424
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Éditeur de contacts"
 
@@ -1547,7 +1449,7 @@ msgid "D_epartment:"
 msgstr "_Service :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "Détails"
 
@@ -1588,1135 +1490,1136 @@ msgstr "_Organisation :"
 msgid "P_rofession:"
 msgstr "_Profession :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Types de téléphones"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "S_pouse:"
 msgstr "_Conjoint(e) :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "This is the _mailing address"
 msgstr "Adresse de la _liste de diffusion"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Wants to receive _HTML mail"
 msgstr "Veut recevoir des messages _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:673 calendar/gui/e-calendar-table.c:992
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3522
-#: filter/filter.glade.h:15 mail/folder-browser.c:1762
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
 #: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
 #: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
 #: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "Fonct_ion :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "Nom du _directeur :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "Sur_nom :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Bureau :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "Url du calendrier _public :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "Adresse page _Web :"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:100
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
-#: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:373
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:473
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:183
 #, fuzzy
 msgid "Editable"
 msgstr "Activer"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "Etats Unis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Algérie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr "Samoa (US)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr "Andorre"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Antarctica"
 msgstr "Antartique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr "Antigua et Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr "Arménie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Australie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Autriche"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "Azerbaïdjan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahreïn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr "Barbade"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr "Biélorussie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belgique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr "Bénin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr "Bermudes"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr "Bhoutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnie Herzégovine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr "Ile Bouvet"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brésil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
 msgstr "Territoire britannique de l'océan Indien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr "Brunéi et Darussalam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgarie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Burkina Faso"
 msgstr "Burkina-Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr "Cambodge"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr "Cameroun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr "Cap Vert"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Iles Caïman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
 msgstr "République Centre-Africaine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "Tchad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chili"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "Chine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Ile Christmas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr "Iles Cocos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Colombie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr "Comores"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Congo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr "Iles Cook"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr "Côte d'Ivoire"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Croatie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Cuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Chypre"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "République Tchèque"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Danemark"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr "Dominique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "République Dominicaine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "Timor Oriental"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Equateur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egypte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Guinée Equatoriale"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Erithrée"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estonie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Ethiopie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Iles Malouines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Iles Feroe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Iles Fidji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finlande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "France"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Guyane Française"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Polynésie Francaise"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Terres Australes Françaises"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Géorgie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Allemagne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Grèce"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Groenland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Grenade"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guaam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatémala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr "Guinée"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr "Guinée Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr "Iles Heard et McDonald"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "Vatican"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Hongrie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Islande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "Inde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "Indonésie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irlande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israël"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Italie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaïque"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Japon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Republic Of"
 msgstr "Corée (République de)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Koweit"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr "Kyrghiztan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr "Lettonie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Liban"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Libéria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lithuanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Macau"
 msgstr "Macao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr "Macédoine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr "Malaisie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr "Maldives"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr "Iles Marshall"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr "Mauritanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr "Maurice"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr "Mexique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr "Micronésie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Moldova, Republic Of"
 msgstr "Moldavie (Républiqe de)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr "Mongolie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr "Maroc"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr "Nanibie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr "Népal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr "Pays-Bas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "Antilles Néerlandaises"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "Nouvelle Calédonie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr "Nouvelle Zélande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr "Nigéria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr "Ile Norfolk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr "Iles Marianes"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr "Norvège"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr "Territoire paléstinien"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr "Papouasie Nouvelle Guinée"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
 msgid "Peru"
 msgstr "Pérou"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr "Philippines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr "Pologne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr "Prto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr "Quatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr "La Réunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr "Roumanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr "Russie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr "St Kitts et Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr "Sainte Lucie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Saint Vincent et Les Grenadines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "San Marino"
 msgstr "San Marin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
 msgstr "Säo Tome et Pricipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr "Arabie Saoudite"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr "Sénégal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr "Singapour"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr "Slovaquie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr "Slovénie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr "Iles Salomon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr "Somalie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr "Afrique du Sud"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Georgie du Sud et Iles Sandwitch"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr "Espagne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr "St Hélène"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr "St Pierre et Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr "Soudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Iles Jan Mayen et Spitzberg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr "Suède"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr "Suisse"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzanie (République Unie de)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "Thailande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr "Trinidad et Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "Tunisie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr "Turquie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr "Iles Turks et Caïques"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr "Ouganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
 msgstr "Emirats Unis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr "Grande Bretagne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr "Iles isolées (US)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr "Uzbékistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr "Vénézuéla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Virgin Islands, British"
 msgstr "Iles Vierges (Anglaises)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Virgin Islands, U.S."
 msgstr "Iles Vierges (US)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr "Iles Wallis et Futuna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr "Sahara Occidental"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr "Yémen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr "Yougoslavie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr "Zambie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:155
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
-#: addressbook/gui/widgets/e-addressbook-model.c:297
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:359
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:459
 #, fuzzy
 msgid "Book"
 msgstr "Bodo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:162
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 #, fuzzy
 msgid "Card"
 msgstr "Voiture"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:169
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
 #, fuzzy
 msgid "Is New Card"
 msgstr "Nouveau"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:176
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Merril Field"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:190
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
 #, fuzzy
 msgid "Changed"
 msgstr "Tchad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:869
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Editeur de catégorie non disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:877
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "Ce contact appartient à ces catégories : "
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1091
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Enregistrer comme VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1137
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
@@ -2725,7 +2628,7 @@ msgstr ""
 "Êtes-vous sûr de vouloir \n"
 "supprimer ce contact ?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1140
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2733,51 +2636,42 @@ msgstr ""
 "Êtes-vous sûr de vouloir \n"
 "supprimer ce contact ?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1144
-#: addressbook/gui/widgets/e-addressbook-view.c:847 filter/libfilter-i18n.h:10
-#: mail/mail-accounts.c:227 mail/mail-accounts.c:239
-#: shell/e-shell-folder-commands.c:412 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
-msgid "Delete"
-msgstr "Supprimer"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1853
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2468
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Ne peut trouver un widget pour un champ :  « %s »"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Ajout express de contact"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:306
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Éditer entièrement"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:336
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:67
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:217
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2786,16 +2680,10 @@ msgstr ""
 "%s existe déjà\n"
 "Voulez vous l'écraser ?"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:220
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/fullname.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "*"
-msgstr ""
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2 :"
@@ -2896,30 +2784,30 @@ msgstr "_Suffixe :"
 msgid "_Title:"
 msgstr "_Titre :"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "List _name:"
 msgstr "_Nom de liste :"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Members"
 msgstr "Membres"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 "Saisissez une adresse électronique ou déplacez un contact dans la liste ci-"
 "dessous"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Cacher les adresses lors de l'envoi d'un E-mail à cette liste"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Effacer"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "contact-list-editor"
 msgstr "Éditeur de liste de contacts"
 
@@ -2986,146 +2874,148 @@ msgstr ""
 "Le nom ou l'adresse E-mail modifié  de ce contact existe déjà\n"
 "dans ce dossier. Voulez vous quand même l'ajouter ?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:143
-#: widgets/misc/e-filter-bar.c:150
+#. FIXME: get the toplevel window...
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:149
-#: mail/mail-search.c:298
-msgid "Search"
-msgstr "Rechercher"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:155
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Pas de cartes"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:158
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 carte"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:161
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d cartes"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:366
-#: addressbook/gui/widgets/e-addressbook-view.c:179
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:466
 #, fuzzy
 msgid "Query"
 msgstr "Quimper"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:441
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 msgid "Error getting book view"
 msgstr "Erreur d'obtention de la vue livre"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:380
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 #, fuzzy
 msgid "Model"
 msgstr "Molde"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
-#: addressbook/gui/widgets/e-addressbook-util.c:99
-#: addressbook/gui/widgets/e-minicard.c:514
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Erreur lors de la modification de la carte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1153
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Succès"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:519 shell/e-shell.c:2093
-#: shell/e-storage.c:602 shell/evolution-shell-component.c:1192
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Repository Hors ligne"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:588
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Carte non trouvée"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "L'ID de la carte existe déjà"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protocole non supporté"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/print.c:2298
-#: camel/camel-service.c:739 camel/camel-service.c:781
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:779
 #: camel/camel-service.c:849 camel/camel-service.c:892
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr "Annulée"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr " Échec de l'Identification"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Identification Requise"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS Non Disponible"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Le carnet d'adresses n'existe pas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Autre Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:69
-#: calendar/gui/dialogs/save-comp.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Voulez-vous enregistrer les modifications ?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#, fuzzy
+msgid "_Discard"
+msgstr "Dinard"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Ajout liste : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
-#: addressbook/gui/widgets/e-addressbook-util.c:266
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Ajout carte : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:99
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Modification de liste : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:109
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Suppression de liste : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:109
-#: addressbook/gui/widgets/e-addressbook-util.c:224
-#: addressbook/gui/widgets/e-addressbook-view.c:1621
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Suppression de carte : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:191
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -3134,116 +3024,132 @@ msgstr ""
 "L'affichage de %d cartes implique l'ouverture de %d nouvelles fenêtres. \n"
 "Voulez-vous vraiment afficher toutes ces cartes ?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:322
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Déplacer la carte vers"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:324
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Copier la carte vers"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:327
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Déplacer les cartes vers"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Copier les cartes vers"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:186
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Multiples VCards"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard pour %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Carnet d'adresses"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
-#: addressbook/gui/widgets/e-addressbook-view.c:831
-#: addressbook/gui/widgets/e-addressbook-view.c:1749
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Enregistrer comme VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
 msgstr "Nouveau contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:819
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
 msgstr "Nouvelle liste de contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Go to Folder..."
 msgstr "Aller au Dossier..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Import..."
 msgstr "Importer..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:825
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
 msgstr "Rechercher des Contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:826
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Addressbook Sources..."
 msgstr "Sources du Carnet d'Adresses..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:828
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Pilot Settings..."
 msgstr "Paramétrage du Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:832
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Faire suivre au contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Envoyer un _message au contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:834
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimer"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:836
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Imprimer En_veloppe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:840
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Copy to folder..."
 msgstr "Copier vers le dossier..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:841
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Move to folder..."
 msgstr "Déplacer vers le dossier..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:844
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Couper"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:845
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:846
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Coller"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:851
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3487
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+msgid "Delete"
+msgstr "Supprimer"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 msgid "Current View"
 msgstr "Vue courante"
 
@@ -3251,7 +3157,7 @@ msgstr "Vue courante"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3259,11 +3165,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3331,19 +3237,60 @@ msgstr "Autre Téléphone"
 msgid "Primary Phone"
 msgstr "Téléphone Principal"
 
-#: addressbook/gui/widgets/e-minicard-control.c:189
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr "et %d autres cartes."
 
-#: addressbook/gui/widgets/e-minicard-control.c:191
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "et une autre carte."
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "Enregistrer dans le carnet d'adresses"
 
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+#, fuzzy
+msgid "Width"
+msgstr "Largeur :"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "Hauteur :"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+#, fuzzy
+msgid "Field"
+msgstr "Fairfield"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "Nom de famille"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+#, fuzzy
+msgid "Text Model"
+msgstr "Molde"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#, fuzzy
+msgid "Column Width"
+msgstr "Columbia"
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3373,45 +3320,36 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adrar"
 
-#: addressbook/gui/widgets/e-minicard.c:138
-#, fuzzy
-msgid "Width"
-msgstr "Largeur :"
-
-#: addressbook/gui/widgets/e-minicard.c:145
-#, fuzzy
-msgid "Height"
-msgstr "Hauteur :"
-
-#: addressbook/gui/widgets/e-minicard.c:153
-msgid "Has Focus"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:161
+#: addressbook/gui/widgets/e-minicard.c:169
 #, fuzzy
 msgid "Selected"
 msgstr "Sélectionné : "
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:176
 #, fuzzy
 msgid "Has Cursor"
 msgstr "Tri par tâche"
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:23
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Vue carte"
 
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#, fuzzy
+msgid "GTK Tree View"
+msgstr "Vue hebdomadaire"
+
 #: addressbook/printing/e-contact-print-envelope.c:216
 #: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Imprimer l'enveloppe"
 
-#: addressbook/printing/e-contact-print.c:1118
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Imprimer les cartes"
 
-#: addressbook/printing/e-contact-print.c:1180
-#: addressbook/printing/e-contact-print.c:1202
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
 msgid "Print card"
 msgstr "Imprimer la carte"
 
@@ -3484,7 +3422,6 @@ msgid "Include:"
 msgstr "Inclure :"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:638
 msgid "Landscape"
 msgstr "Paysage"
 
@@ -3504,17 +3441,16 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Nombre de colonnes :"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Options"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:625
 msgid "Orientation"
 msgstr "Orientation"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Page"
 
@@ -3530,9 +3466,7 @@ msgstr "Papier"
 msgid "Paper source:"
 msgstr "Source  papier :"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:631
 msgid "Portrait"
 msgstr "Portrait"
 
@@ -3588,47 +3522,171 @@ msgstr "Largeur :"
 msgid "_Font..."
 msgstr "_Police..."
 
-#: calendar/cal-util/cal-component.c:1216
+#: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Rendez-vous sans titre"
 
-#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr "1er"
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "2ème"
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "3ème"
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr "4ème"
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr "5ème"
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr "6ème"
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr "7ème"
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr "8ème"
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr "9ème"
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr "10ème"
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr "11ème"
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr "12ème"
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr "13ème"
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr "14ème"
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr "15ème"
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr "16ème"
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr "17ème"
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr "18ème"
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr "19ème"
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr "20ème"
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr "21ème"
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "22ème"
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "23ème"
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr "24ème"
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr "25ème"
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr "26ème"
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr "27ème"
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr "28ème"
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr "29ème"
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr "30ème"
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr "31ème"
+
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:417 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "Haute"
 
-#: calendar/cal-util/cal-util.c:501 calendar/cal-util/cal-util.c:523
-#: calendar/gui/calendar-model.c:1721
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:503 calendar/cal-util/cal-util.c:525
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "Basse"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:519
-#: calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr "Indéfinie"
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Erreur lors de la communication avec le serveur de calendrier"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Impossible de lire les données du block Calendrier du Pilot"
 
@@ -3636,11 +3694,61 @@ msgstr "Impossible de lire les données du block Calendrier du Pilot"
 msgid "Default Priority:"
 msgstr "Priorité par défaut :"
 
-#: calendar/conduits/todo/todo-conduit.c:951
 #: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossible de lire les données du bloc « A faire » du Pilot"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Calendrier et Tâches"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+"Configurez ici votre fuseau horaire, votre Calendrier et votre Liste de "
+"Tâches"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Calendrier et Tâches"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Composant « Résumé du calendrier » du Résumé d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Usine pour le contrôle de configuration du Résumé Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Afficheur Calendrier iTip/iMip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Afficheur Calendrier iTip/iMip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Editeur de News d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Editeur de News d'Evolution"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Utilitaire pour le service de notification d'alarme"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Starting:"
 msgstr "Débute : "
@@ -3679,18 +3787,17 @@ msgstr "Durée du report (minutes)"
 msgid "_Edit appointment"
 msgstr "Éditer le rendez-vous"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:679
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Aucune description disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:741
-#: calendar/gui/alarm-notify/alarm-queue.c:765
-#: calendar/gui/tasks-control.c:455 mail/mail-callbacks.c:2809
-#: widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Avertissement"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:745
+#: calendar/gui/alarm-notify/alarm-queue.c:849
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3703,7 +3810,7 @@ msgstr ""
 "un courrier. Evolution affichera une fenêtre \n"
 "d'avertissement classique à la place."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:771
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3720,31 +3827,31 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment lancer ce programme ?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:785
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 msgid "Do not ask me about this program again."
 msgstr "Ne plus me demander à propos de ce programme."
 
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:157
+#: calendar/gui/alarm-notify/notify-main.c:173
 msgid "Could not initialize gnome-vfs"
 msgstr "Ne peut initialiser gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
 msgstr "Impossible de créer l'usine à services de notification d'alarme"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Le résumé contient"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "La description contient"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Le commentaire contient"
 
-#: calendar/gui/cal-search-bar.c:383 mail/mail-ops.c:1108
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr "Différent"
 
@@ -3754,8 +3861,8 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:287
-#: calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:332
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3773,7 +3880,7 @@ msgstr "%A %d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:432
-#: calendar/gui/e-week-view-main-item.c:340 calendar/gui/print.c:1490
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3784,67 +3891,156 @@ msgstr ""
 "Ne peut créer la vue du calendrier. Veuillez vérifier la configuration "
 "d'ORBit et d'OAF."
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
+msgid "Calendar"
+msgstr "Calendrier"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "Dossier contenant des rendez-vous et des événements"
+
+#: calendar/gui/calendar-component.c:75
+msgid "Public Calendar"
+msgstr "Calendrier Public"
+
+#: calendar/gui/calendar-component.c:76
+msgid "Public folder containing appointments and events"
+msgstr "Dossier public contenant des rendez-vous et des événements"
+
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
+msgid "Tasks"
+msgstr "Tâches"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "Dossier contenant des éléments « À Faire »"
+
+#: calendar/gui/calendar-component.c:85
+msgid "Public Tasks"
+msgstr "Tâches Publiques"
+
+#: calendar/gui/calendar-component.c:86
+msgid "Public folder containing to-do items"
+msgstr "Dossier public contenant des éléments « À Faire »"
+
+#: calendar/gui/calendar-component.c:730
+msgid "New appointment"
+msgstr "Nouveau RDV"
+
+#: calendar/gui/calendar-component.c:730
+msgid "_Appointment"
+msgstr "_Rendez-vous"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Créer un nouveau rendez-vous"
+
+#: calendar/gui/calendar-component.c:735
+msgid "New meeting"
+msgstr "Nouvelle réunion"
+
+#: calendar/gui/calendar-component.c:735
+msgid "_Meeting"
+msgstr "Ré_union"
+
+#: calendar/gui/calendar-component.c:736
+msgid "Create a new meeting request"
+msgstr "Créer une nouvelle demande de Rendez-Vous"
+
+#: calendar/gui/calendar-component.c:740
+msgid "New task"
+msgstr "Nouvelle tâche"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_Tâche"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Créer une nouvelle tâche"
+
+#: calendar/gui/calendar-component.c:745
+msgid "New All Day Appointment"
+msgstr "Nouveau rendez-vous quotidien"
+
+#: calendar/gui/calendar-component.c:745
+msgid "All _Day Appointment"
+msgstr "Rendez-vous _journée entière"
+
+#: calendar/gui/calendar-component.c:746
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Nouveau rendez-vous quotidien"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Privé"
 
-#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
+#: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Confidentiel"
 
-#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:395
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
 msgid "Public"
 msgstr "_Public"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
-#: calendar/gui/e-calendar-table.c:469
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
+#: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:470
-#: calendar/gui/e-meeting-time-sel.c:428
-#: shell/evolution-shell-component.c:1177
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr "Occupé"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:490 calendar/gui/print.c:2289
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "Non démarrée"
 
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2292
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "En cours"
 
-#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/e-meeting-model.c:327
-#: calendar/gui/e-meeting-model.c:350 calendar/gui/print.c:2295
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "Achevée"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3855,332 +4051,155 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:308
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1971
-#: mail/folder-browser.c:1724 mail/mail-account-gui.c:1225
-#: mail/mail-account-gui.c:1639 mail/mail-accounts.c:465
-#: mail/mail-accounts.c:479 mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:196
-#: widgets/misc/e-cell-date-edit.c:254 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1471 widgets/misc/e-dateedit.c:1586
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:79
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "Aucune"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Récurrant"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Attribué"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:299
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:565
-#: calendar/gui/e-meeting-model.c:859
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
+#: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr "Oui"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:311
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Non"
 
-#: calendar/gui/calendar-view-factory.c:147
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Vue journalière"
 
-#: calendar/gui/calendar-view-factory.c:150
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "Vue hebdomadaire de travail"
 
-#: calendar/gui/calendar-view-factory.c:153
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "Vue hebdomadaire"
 
-#: calendar/gui/calendar-view-factory.c:156
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "Vue mensuelle"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/gnome-cal.c:1357
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1079
-msgid "Calendar"
-msgstr "Calendrier"
-
-#: calendar/gui/component-factory.c:73
-msgid "Folder containing appointments and events"
-msgstr "Dossier contenant des rendez-vous et des événements"
-
-#: calendar/gui/component-factory.c:77
-msgid "Public Calendar"
-msgstr "Calendrier Public"
-
-#: calendar/gui/component-factory.c:78
-msgid "Public folder containing appointments and events"
-msgstr "Dossier public contenant des rendez-vous et des événements"
-
-#: calendar/gui/component-factory.c:82 calendar/gui/e-tasks.c:716
-#: calendar/gui/print.c:1776 calendar/gui/tasks-control.c:509
-#: calendar/importers/icalendar-importer.c:702
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:326
-#: my-evolution/e-summary-tasks.c:344 shell/e-local-storage.c:184
-#: shell/e-shortcuts.c:1083
-msgid "Tasks"
-msgstr "Tâches"
-
-#: calendar/gui/component-factory.c:83
-msgid "Folder containing to-do items"
-msgstr "Dossier contenant des éléments « À Faire »"
-
-#: calendar/gui/component-factory.c:87
-msgid "Public Tasks"
-msgstr "Tâches Publiques"
-
-#: calendar/gui/component-factory.c:88
-msgid "Public folder containing to-do items"
-msgstr "Dossier public contenant des éléments « À Faire »"
-
-#: calendar/gui/component-factory.c:749
-msgid "New appointment"
-msgstr "Nouveau RDV"
-
-#: calendar/gui/component-factory.c:749
-msgid "_Appointment"
-msgstr "_Rendez-vous"
-
-#: calendar/gui/component-factory.c:750
-msgid "Create a new appointment"
-msgstr "Créer un nouveau rendez-vous"
-
-#: calendar/gui/component-factory.c:754
-msgid "New meeting"
-msgstr "Nouvelle réunion"
-
-#: calendar/gui/component-factory.c:754
-msgid "_Meeting"
-msgstr "Ré_union"
-
-#: calendar/gui/component-factory.c:755
-msgid "Create a new meeting request"
-msgstr "Créer une nouvelle demande de Rendez-Vous"
-
-#: calendar/gui/component-factory.c:759
-msgid "New task"
-msgstr "Nouvelle tâche"
-
-#: calendar/gui/component-factory.c:759
-msgid "_Task"
-msgstr "_Tâche"
-
-#: calendar/gui/component-factory.c:760
-msgid "Create a new task"
-msgstr "Créer une nouvelle tâche"
-
-#: calendar/gui/component-factory.c:764
-msgid "New All Day Appointment"
-msgstr "Nouveau rendez-vous quotidien"
+#: calendar/gui/comp-editor-factory.c:456
+#, fuzzy
+msgid "Error while opening the calendar"
+msgstr "Erreur lors de la communication avec le serveur de calendrier"
 
-#: calendar/gui/component-factory.c:764
-msgid "All _Day Appointment"
-msgstr "Rendez-vous _journée entière"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
 
-#: calendar/gui/component-factory.c:765
+#: calendar/gui/comp-editor-factory.c:473
 #, fuzzy
-msgid "Create a new all-day appointment"
-msgstr "Nouveau rendez-vous quotidien"
+msgid "Permission denied to open the calendar"
+msgstr "Permission refusée"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Ne peut ouvrir le dossier dans « %s »"
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "L'URI que le calendrier affichera"
 
-#: calendar/gui/control-factory.c:174
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Le type de vue à afficher"
 
-#: calendar/gui/dialogs/alarm-options.c:358
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Options d'alarme sonore"
 
-#: calendar/gui/dialogs/alarm-options.c:367
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Options Message d'Alarme"
 
-#: calendar/gui/dialogs/alarm-options.c:376
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Options Alarme E-mail"
 
-#: calendar/gui/dialogs/alarm-options.c:385
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Options Alarm Programme"
 
-#: calendar/gui/dialogs/alarm-options.c:394
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Options Alarme inconnue"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Répétition Alarme"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
-msgstr ""
-"Evolution ne supporte pas encore la notification des rappels par courier "
-"électronique. Vous ne pourrez pas éditer les options pour ce rappel."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Message à afficher"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Corps du message"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Jouer le son : "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Répéter l'alarme"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Lancer le programme :"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Envoyer"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Avec ces arguments :"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:68
-#: filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
 msgid "days"
 msgstr "jours"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "toutes les"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:67
-#: filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "heures"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:66
-#: filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutes"
 
-#: calendar/gui/dialogs/alarm-page.c:318
-#, c-format
-msgid "%d days"
-msgstr "%d jours"
-
-#: calendar/gui/dialogs/alarm-page.c:321
-msgid "1 day"
-msgstr "1 jour"
-
-#: calendar/gui/dialogs/alarm-page.c:326
-#, c-format
-msgid "%d weeks"
-msgstr "%d semaines"
-
-#: calendar/gui/dialogs/alarm-page.c:329
-msgid "1 week"
-msgstr "1 semaine"
-
-#: calendar/gui/dialogs/alarm-page.c:334
-#, c-format
-msgid "%d hours"
-msgstr "%d heures"
-
-#: calendar/gui/dialogs/alarm-page.c:337
-msgid "1 hour"
-msgstr "1 heure"
-
-#: calendar/gui/dialogs/alarm-page.c:342
-#, c-format
-msgid "%d minutes"
-msgstr "%d minutes"
-
-#: calendar/gui/dialogs/alarm-page.c:345
-msgid "1 minute"
-msgstr "1 minute"
-
-#: calendar/gui/dialogs/alarm-page.c:350
-#, c-format
-msgid "%d seconds"
-msgstr "%d secondes"
-
-#: calendar/gui/dialogs/alarm-page.c:353
-msgid "1 second"
-msgstr "1 seconde"
-
-#: calendar/gui/dialogs/alarm-page.c:382
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "Émettre un son"
-
-#: calendar/gui/dialogs/alarm-page.c:386
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Afficher un message"
-
-#: calendar/gui/dialogs/alarm-page.c:390
-msgid "Send an email"
-msgstr "Envoyer un E-mail"
-
-#: calendar/gui/dialogs/alarm-page.c:394
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Lancer un programme"
-
-#: calendar/gui/dialogs/alarm-page.c:400
-msgid "Unknown action to be performed"
-msgstr "Action inconnue à exécuter"
-
-#: calendar/gui/dialogs/alarm-page.c:412
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s avant le début du rendez-vous"
-
-#: calendar/gui/dialogs/alarm-page.c:415
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s après le début du rendez-vous"
-
-#: calendar/gui/dialogs/alarm-page.c:420
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s au début du rendez-vous"
-
-#: calendar/gui/dialogs/alarm-page.c:429
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s avant la fin du rendez-vous"
-
-#: calendar/gui/dialogs/alarm-page.c:432
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s après la fin du rendez-vous"
-
-#: calendar/gui/dialogs/alarm-page.c:437
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s à la fin du  rendez-vous"
-
-#: calendar/gui/dialogs/alarm-page.c:461
-#, c-format
-msgid "%s at %s"
-msgstr "%s à %s"
-
-#: calendar/gui/dialogs/alarm-page.c:467
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s pour un type d'activation inconnu"
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4191,46 +4210,63 @@ msgstr "Basique"
 msgid "Date/Time:"
 msgstr "Date/Heure :"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Afficher un message"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Émettre un son"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Rappels"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Lancer un programme"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Envoyer un E-mail"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:826 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Résumé :"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Options..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "aprés le"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "avant le"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "jour(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "Fin du rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "heure(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "minute(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "Début du rendez-vous"
 
@@ -4279,7 +4315,8 @@ msgid "Days"
 msgstr "Jours"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1136
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Vendredi"
 
@@ -4292,7 +4329,8 @@ msgid "Minutes"
 msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1132
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Lundi"
 
@@ -4301,7 +4339,8 @@ msgid "S_un"
 msgstr "_Dim"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1137
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Samedi"
 
@@ -4315,7 +4354,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Afficher les numéros de semaine"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1138
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -4332,7 +4372,8 @@ msgid "Task List"
 msgstr "Liste des tâches"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1135
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Jeudi"
 
@@ -4349,7 +4390,8 @@ msgid "Time format:"
 msgstr "Format de date :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1133
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Mardi"
 
@@ -4358,7 +4400,8 @@ msgid "W_eek starts:"
 msgstr "La s_emaine débute : "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1134
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Mercredi"
 
@@ -4400,7 +4443,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Général"
 
@@ -4442,7 +4485,7 @@ msgstr "M_er"
 msgid "before every appointment"
 msgstr "avant chaque rendez-vous"
 
-#: calendar/gui/dialogs/cancel-comp.c:55
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -4450,11 +4493,11 @@ msgstr ""
 "L'évènement faisant l'objet d'une suppression est un rendez-vous, voulez "
 "vous envoyer une note d'annulation"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Êtes-vous sûr de vouloir annuler et supprimer cette réunion ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:64
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -4462,11 +4505,11 @@ msgstr ""
 "La tâche faisant l'objet d'une suppression est attribuée, voulez vous "
 "envoyer une note d'annulation ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Êtes-vous sûr de vouloir annuler et supprimer cette tâche ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:73
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -4474,7 +4517,7 @@ msgstr ""
 "L'entrée du journal faisant l'objet d'une suppression est publiée, voulez "
 "vous envoyer une note d'annulation ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Êtes-vous sûr de vouloir annuler et supprimer l'entrée de journal ?"
 
@@ -4526,81 +4569,86 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Vous n'avez fait aucune modification, Mettre à jour l'éditeur ?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2207
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Erreur inconnue : %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " À "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2211
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
 msgstr " (Terminé "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2213
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 msgid "Completed "
 msgstr "Terminé "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2218
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr " (Date d'échéance "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2220
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr "Date d'échéance "
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 msgid "Could not update invalid object"
 msgstr "Impossible de mettre à jour l'objet invalide"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr "Objet non trouvé, mise à jour non effectuée"
 
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr "Vous n'avez pas la permission de mettre à jour cet objet"
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
 msgid "Could not update object"
 msgstr "Impossible de mettre à jour l'objet"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Éditer le rendez-vous"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Tâche - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrée de journal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Aucun résumé"
 
-#: calendar/gui/dialogs/comp-editor.c:1221
-#: calendar/gui/e-calendar-table.c:1059 calendar/gui/e-day-view.c:3955
-#: calendar/gui/e-week-view.c:3720 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: calendar/gui/dialogs/comp-editor.c:1322
-#: calendar/gui/dialogs/comp-editor.c:1346
-#: calendar/gui/dialogs/comp-editor.c:1370
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1331
+#: calendar/gui/dialogs/comp-editor.c:1355
+#: calendar/gui/dialogs/comp-editor.c:1379
+#, fuzzy
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Les changements apportés à cet élément peuvent être annulés si une mise à "
 "jour arrive par courier"
 
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "Récupération de la version courante impossible !"
 
@@ -4658,87 +4706,100 @@ msgstr "Délégué À :"
 msgid "Enter Delegate"
 msgstr "Saisissez un délégué"
 
-#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2246
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Rappeler"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Récurrence"
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:433
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr "Programme"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Réunion"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
+#, fuzzy
+msgid "Start date is wrong"
+msgstr "Date de début"
+
+#: calendar/gui/dialogs/event-page.c:610
+msgid "End date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:633
+#, fuzzy
+msgid "Start time is wrong"
+msgstr "Heure de _début :"
+
+#: calendar/gui/dialogs/event-page.c:640
+msgid "End time is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "_Toute la journée"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "_Occupé"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Classification"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "Con_fidentiel"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Date & heure"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "_Libre"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "_Lieu :"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_vé"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Afficher l'heure comme"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Résu_mé :"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Contacts..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "Heure de _fin :"
@@ -4747,19 +4808,23 @@ msgstr "Heure de _fin :"
 msgid "_Start time:"
 msgstr "Heure de _début :"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr "Un organisateur est nécessaire"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "Au moins un participant est nécessaire."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "Cette personne assiste déjà à la réunion !"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Délégué à..."
 
@@ -4799,14 +4864,14 @@ msgid "Member"
 msgstr "Membre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Réponse S.V.P"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "État"
@@ -4821,98 +4886,82 @@ msgid "_Change Organizer"
 msgstr "_Changer l'organizer"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:446
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr "_Inviter d'autres personnes..."
 
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-#: calendar/gui/dialogs/recurrence-page.c:157
-msgid "st"
-msgstr "er"
-
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-msgid "nd"
-msgstr "ème"
-
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:149
-msgid "rd"
-msgstr "ème"
-
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-#: calendar/gui/dialogs/recurrence-page.c:156
-msgid "th"
-msgstr "ième"
-
-#: calendar/gui/dialogs/recurrence-page.c:630
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:75
+#, fuzzy
+msgid "This and Future Instances"
+msgstr "Iles Wallis et Futuna"
+
+#: calendar/gui/dialogs/recur-comp.c:77
+#, fuzzy
+msgid "All Instances"
+msgstr "Alliance"
+
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ce rendez-vous contient des récurrences qu'Evolution ne peut éditer."
 
-#: calendar/gui/dialogs/recurrence-page.c:899
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1008
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "le"
 
-#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr "premier"
 
-#: calendar/gui/dialogs/recurrence-page.c:1074 filter/filter-datespec.c:65
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "seconde"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr "troisième"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr "quatrième"
 
-#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr "dernier"
 
-#: calendar/gui/dialogs/recurrence-page.c:1103
+#: calendar/gui/dialogs/recurrence-page.c:1004
 msgid "Other Date"
 msgstr "Autre date"
 
-#: calendar/gui/dialogs/recurrence-page.c:1131 filter/filter-datespec.c:68
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "jour"
 
-#: calendar/gui/dialogs/recurrence-page.c:1271
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "le"
 
-#: calendar/gui/dialogs/recurrence-page.c:1456
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "récurrences"
 
@@ -4976,24 +5025,29 @@ msgstr "semaine(s)"
 msgid "year(s)"
 msgstr "année(s)"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr "Les informations de la réunion ont été créées. Envoyer ?"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Les informations de la réunion ont changé.Envoyer une version mise à jour ?"
 
-#: calendar/gui/dialogs/send-comp.c:65
+#: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
 msgstr "Les assignations de tâche ont été créées. Envoyer ?"
 
-#: calendar/gui/dialogs/send-comp.c:69
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Les informations de la tâche ont changé.Envoyer une version mise à jour ?"
 
+#: calendar/gui/dialogs/task-details-page.c:397
+#, fuzzy
+msgid "Completed date is wrong"
+msgstr "Terminé "
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -5004,40 +5058,38 @@ msgstr "Terminé"
 msgid "Date Completed:"
 msgstr "Date d'achèvement :"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-meeting-model.c:340
-#: calendar/gui/e-meeting-model.c:571 calendar/gui/e-meeting-model.c:872
-msgid "Needs Action"
-msgstr "Nécessite une action"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "En cours"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:629
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr "URL :"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Priorité :"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_État :"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Basique"
 
-#: calendar/gui/dialogs/task-editor.c:216
-#: calendar/gui/dialogs/task-editor.c:261
-#: calendar/gui/dialogs/task-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr "Tâche"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:880
+#: calendar/gui/dialogs/task-page.c:527
+msgid "Due date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
@@ -5047,135 +5099,232 @@ msgstr "Description :"
 msgid "Sta_rt Date:"
 msgstr "Date de _début :"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Contacts..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Date d'_échéance :"
 
-#: calendar/gui/e-calendar-table.c:439
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d jours"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 jour"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d semaines"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 semaine"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d heures"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 heure"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutes"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 minute"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d secondes"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 seconde"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Envoyer un E-mail"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Action inconnue à exécuter"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s avant le début du rendez-vous"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s après le début du rendez-vous"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s au début du rendez-vous"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s avant la fin du rendez-vous"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s après la fin du rendez-vous"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s à la fin du  rendez-vous"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s à %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s pour un type d'activation inconnu"
+
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:418
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:419
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:420
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:421
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:422
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:423
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:424
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-calendar-table.c:425
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:739 calendar/gui/e-day-view.c:2839
-#: calendar/gui/e-week-view.c:1884
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1910
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: calendar/gui/e-calendar-table.c:973 calendar/gui/e-day-view.c:3722
-#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1735
-#: shell/e-shortcuts-view.c:412 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Ouvrir"
 
-#: calendar/gui/e-calendar-table.c:974
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr "Enregistrer _sous..."
 
-#: calendar/gui/e-calendar-table.c:975 calendar/gui/e-day-view.c:3724
-#: calendar/gui/e-week-view.c:3479 calendar/gui/e-week-view.c:3506
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3729
-#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_uper"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3730
-#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copier"
 
-#: calendar/gui/e-calendar-table.c:981 calendar/gui/e-day-view.c:3695
-#: calendar/gui/e-day-view.c:3731 calendar/gui/e-week-view.c:3483
-#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "C_oller"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr "_Affecter une tâche"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr "_Faire suivre comme iCalendar"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "Marquer comme terminé"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:965
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marquer les tâches comme terminées"
 
-#: calendar/gui/e-calendar-table.c:993
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "Supprimer les tâches sélectionnées"
 
-#: calendar/gui/e-calendar-table.c:1263 calendar/gui/e-day-view.c:7554
-#: calendar/gui/e-week-view.c:4198
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
-#: calendar/gui/e-calendar-table.c:1346
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une tâche"
@@ -5184,8 +5333,8 @@ msgstr "Cliquez ici pour ajouter une tâche"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1000
-#: camel/camel-filter-driver.c:1095
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Terminé"
 
@@ -5214,8 +5363,8 @@ msgid "Start Date"
 msgstr "Date de début"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:763
-#: shell/e-shortcuts.c:1071
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Résumé"
 
@@ -5246,133 +5395,212 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:520
+#: calendar/gui/e-day-view-time-item.c:529
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisions par minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:283 calendar/gui/e-day-view.c:1389
-#: calendar/gui/e-week-view-main-item.c:323 calendar/gui/print.c:1506
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:291 calendar/gui/e-day-view.c:1416
-#: calendar/gui/e-week-view-main-item.c:346
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:370
-#: calendar/gui/print.c:790
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:373
-#: calendar/gui/print.c:792
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3679
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Nouveau _rendez-vous"
 
-#: calendar/gui/e-day-view.c:3681 calendar/gui/e-week-view.c:3473
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "Nouvel évènement de journée complète"
 
-#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3474
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 msgid "New Meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3475
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/e-day-view.c:3690 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimer..."
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3489
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Aller à _aujourd'hui"
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "Aller à la date"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3494
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publier l'information Libre/Occupé"
 
-#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3498
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
+#: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "Paramètre_s..."
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3505
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: calendar/gui/e-day-view.c:3736 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar"
 
-#: calendar/gui/e-day-view.c:3741 calendar/gui/e-week-view.c:3523
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurence déplaçable"
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette occurence"
 
-#: calendar/gui/e-day-view.c:3743 calendar/gui/e-week-view.c:3525
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr "Supprimer toutes les occurences"
 
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "Récurrence _simple"
+
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "Tou(te)s les"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d jours"
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "Tou(te)s les"
+
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr "%d semaines"
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Every week on "
+msgstr "Evergreen"
+
+#: calendar/gui/e-itip-control.c:731
+#, fuzzy, c-format
+msgid "Every %d weeks on "
+msgstr "%d semaines"
+
+#: calendar/gui/e-itip-control.c:739
+#, fuzzy
+msgid " and "
+msgstr "Sable"
+
+#: calendar/gui/e-itip-control.c:746
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:764
+#, fuzzy
+msgid "every month"
+msgstr "1 _mois"
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:775
+#, fuzzy
+msgid "Every year"
+msgstr "Tou(te)s les"
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr "<b>Débute : </b> "
 
-#: calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr "<b>Finit : </b> "
 
-#: calendar/gui/e-itip-control.c:630
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr "<b>Terminé : </b>"
 
-#: calendar/gui/e-itip-control.c:640
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr "<b>Échéance : </b> "
 
-#: calendar/gui/e-itip-control.c:677 calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "Information iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "Erreur iCalendar"
 
-#: calendar/gui/e-itip-control.c:758 calendar/gui/e-itip-control.c:774
-#: calendar/gui/e-itip-control.c:785 calendar/gui/e-itip-control.c:802
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:809
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5381,345 +5609,345 @@ msgstr ""
 "action\n"
 "du menu ci-dessous."
 
-#: calendar/gui/e-itip-control.c:824
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Aucun</i>"
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Lieu : "
 
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "État :"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:342 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:486
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Accepté"
 
-#: calendar/gui/e-itip-control.c:857 calendar/gui/itip-utils.c:489
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Accepté pour voir"
 
-#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:321
-#: calendar/gui/e-meeting-model.c:344 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:492 calendar/gui/itip-utils.c:518
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Refusé"
 
-#: calendar/gui/e-itip-control.c:865 calendar/gui/e-itip-control.c:1071
-#: calendar/gui/e-meeting-model.c:255 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:355 calendar/gui/e-meeting-model.c:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-gpg-context.c:1531
-#: camel/camel-gpg-context.c:1581 camel/camel-tcp-stream-openssl.c:629
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:331
-#: mail/mail-display.c:895 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:445
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: calendar/gui/e-itip-control.c:918 calendar/gui/e-itip-control.c:946
-#: calendar/gui/e-itip-control.c:972 calendar/gui/e-itip-control.c:985
-#: calendar/gui/e-itip-control.c:998 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 msgid "Choose an action:"
 msgstr "Sélectionner une action :"
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Mise à jour"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:951
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-itip-control.c:987
-#: calendar/gui/e-itip-control.c:1000 calendar/gui/e-itip-control.c:1013
-#: shell/e-shell.c:2083 widgets/misc/e-cell-date-edit.c:262
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Accepter"
 
-#: calendar/gui/e-itip-control.c:948
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Accepter pour voir"
 
-#: calendar/gui/e-itip-control.c:949
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Refuser"
 
-#: calendar/gui/e-itip-control.c:973
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Envoyer l'information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:986
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Mettre à jour le status de l'interlocuteur"
 
-#: calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
-#: calendar/gui/e-itip-control.c:1012 calendar/gui/itip-utils.c:506
-#: shell/evolution-shell-component.c:1155 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuler"
 
-#: calendar/gui/e-itip-control.c:1093
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> a publié les informations de la réunion"
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Informations de la réunion"
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> demande la présence de %s à ce rendez-vous. "
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> demande votre présence à cette réunion."
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Proposition de réunion"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> espère être intégré à une réunion existante."
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Mise à jour de la réunion"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> espère recevoir les informations de la dernière réunion."
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Demande de mise à jour de la réunion"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> a répondu à une demande de réunion"
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Réponse à une réunion"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> a annulé une réunion."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Annulation de réunion"
 
-#: calendar/gui/e-itip-control.c:1135 calendar/gui/e-itip-control.c:1202
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> a envoyé un message incompréhensible."
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Mauvais message de réunion"
 
-#: calendar/gui/e-itip-control.c:1160
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> a publié les informations de la tâche."
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Informations de la tâche"
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> demande que %s effectue une tâche. "
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> demande que vous exécutiez une tâche."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Tâche proposée"
 
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> espère être intégré à une tâche existante."
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Mise à jour de tâche"
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> espère recevoir les informationss de la dernière tâche"
 
-#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Demande de mise à jour de tâche"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> a répondu à une assignation de tâche."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Répondre à la tâche"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> a annulé une tâche."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Annulation de tâche"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Mauvais message de tâche"
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> a publié une information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1223
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> demande votre information Libre/Occupé"
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Demande Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1232
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> a répondu à une demande Libre/Occupé"
 
-#: calendar/gui/e-itip-control.c:1233
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Réponse Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Mauvais message Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1312
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr "Le message ne semble pas être correctement rempli"
 
-#: calendar/gui/e-itip-control.c:1374
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Le message ne contient que des requêtes non-supportées."
 
-#: calendar/gui/e-itip-control.c:1402 calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr "L'attachement ne contient pas d'information de calendrier valide"
 
-#: calendar/gui/e-itip-control.c:1433
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "L'attachement ne contient pas d'information de calendrier visualisable"
 
-#: calendar/gui/e-itip-control.c:1654 calendar/gui/e-itip-control.c:1746
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr "L'objet est invalide et ne peut être mis à jour\n"
 
-#: calendar/gui/e-itip-control.c:1657 calendar/gui/e-itip-control.c:1749
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Il y a eu une erreur lors du téléchargement des données pour"
 
-#: calendar/gui/e-itip-control.c:1660 calendar/gui/e-itip-control.c:1752
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 msgid "Object could not be found\n"
 msgstr "L'objet n'a pas pu être trouvé\n"
 
-#: calendar/gui/e-itip-control.c:1663
+#: calendar/gui/e-itip-control.c:1916
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
 "Vous n'avez pas les permissions nécéssaires pour mettre à jour le "
 "calendrier\n"
 
-#: calendar/gui/e-itip-control.c:1666
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Mise à jour terminée\n"
 
-#: calendar/gui/e-itip-control.c:1669
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Le fichier de calendrier n'a pas pu être mis à jour !\n"
 
-#: calendar/gui/e-itip-control.c:1698 calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Le status du participant ne peut être mis à jour car l'entrée n'existe plus"
 
-#: calendar/gui/e-itip-control.c:1719
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Cette réponse ne provient pas d'un participant. L'ajouter comme participant ?"
 
-#: calendar/gui/e-itip-control.c:1731
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Le status du participant n'a pas pu être mis à jour à cause d'un status "
 "invalide !\n"
 
-#: calendar/gui/e-itip-control.c:1755
+#: calendar/gui/e-itip-control.c:2008
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "Vous n'avez pas les permissions nécéssaires pour mettre à jour le "
 "calendrier\n"
 
-#: calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Status du participant mis à jour\n"
 
-#: calendar/gui/e-itip-control.c:1761
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Le status du participant n'a pas pu être mis à jour !\n"
 
-#: calendar/gui/e-itip-control.c:1796
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Effacement Terminé"
 
-#: calendar/gui/e-itip-control.c:1826 calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr "Item envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1828 calendar/gui/e-itip-control.c:1880
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr "L'item n'a pas pu être envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1953
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Sélectionnez un Dossier Calendrier"
 
-#: calendar/gui/e-itip-control.c:1960
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Sélectionnez un Dossier de Tâches"
 
@@ -5760,180 +5988,185 @@ msgstr "date de fin"
 msgid "date-start"
 msgstr "date de début"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Présidents"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1757
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr "Participants demandés"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Participants optionnels"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:83
 msgid "Resources"
 msgstr "Ressources"
 
-#: calendar/gui/e-meeting-model.c:230 calendar/gui/e-meeting-model.c:247
-#: calendar/gui/e-meeting-model.c:561 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr "Individuel"
 
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "Groupe"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "Ressource"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr "Salle"
 
-#: calendar/gui/e-meeting-model.c:265 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr "Président"
 
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:563 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr "Participant exigé"
 
-#: calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:845
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
+#: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr "Participant optionnel"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
+#: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr "Non participant"
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:427
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+msgid "Needs Action"
+msgstr "Nécessite une action"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr "Provisoire"
 
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr "Délégué"
 
-#: calendar/gui/e-meeting-model.c:329 calendar/gui/e-meeting-model.c:352
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 msgid "In Process"
 msgstr "En cours"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:474
+#: calendar/gui/e-meeting-time-sel-item.c:452
 #: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:478
-#: calendar/gui/e-meeting-time-sel.c:2122 e-util/e-time-utils.c:189
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
 #: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:482 e-util/e-time-utils.c:224
-#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1595
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Hors du bureau"
 
-#: calendar/gui/e-meeting-time-sel.c:430
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Pas d'information"
 
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Options"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Afficher _seulement les heures de travail"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Afficher _Zoomé arrière"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Mettre à jour Libre/Occupé"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr "_Choix automatique"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:586
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr "_Toutes les personnes et ressources"
 
-#: calendar/gui/e-meeting-time-sel.c:599
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Toute les _personnes et une ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:612
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "Personnes _nécessaires"
 
-#: calendar/gui/e-meeting-time-sel.c:625
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Personnes nécessaires et _une ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:648
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Heure de _début de la réunion :"
 
-#: calendar/gui/e-meeting-time-sel.c:667
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Heure de _fin de la réunion :"
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:2005
-#: calendar/gui/gnome-cal.c:2016
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tâches à %s"
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:197
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ne peut charger les tâches dans « %s »"
 
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "La méthode requise pour charger « %s » n'est pas supportée"
 
-#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1538
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Vous n'avez pas la permission d'ouvrir ce dossier « %s »"
 
-#: calendar/gui/e-tasks.c:466 calendar/gui/gnome-cal.c:1736
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5942,40 +6175,39 @@ msgstr ""
 "Erreur sur %s : \n"
 " %s"
 
-#: calendar/gui/e-tasks.c:537
+#: calendar/gui/e-tasks.c:554
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Date d'Achèvement"
 
-#: calendar/gui/e-tasks.c:560
+#: calendar/gui/e-tasks.c:577
 msgid "Deleting selected objects..."
 msgstr "Suppression des objets sélectionnés..."
 
-#: calendar/gui/e-tasks.c:653
+#: calendar/gui/e-tasks.c:672
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: calendar/gui/e-week-view.c:3472
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Nouveau _RDV..."
 
-#: calendar/gui/gnome-cal.c:1516
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ne peut ouvrir le dossier dans « %s »"
 
-#: calendar/gui/gnome-cal.c:1527
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "La méthode requise pour ouvrir « %s » n'est pas supportée"
 
-#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1567
+#: calendar/gui/gnome-cal.c:1563
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Ajout d'alarmes pour %s"
 
-#: calendar/gui/gnome-cal.c:1753
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5983,7 +6215,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1762
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5991,12 +6223,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1988
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ouverture du calendrier à %s"
 
-#: calendar/gui/gnome-cal.c:2027
+#: calendar/gui/gnome-cal.c:2035
 msgid "Opening default tasks folder"
 msgstr "Ouverture du dossier de tâches par défaut"
 
@@ -6056,315 +6288,173 @@ msgstr "Octobre"
 msgid "September"
 msgstr "Septembre"
 
-#: calendar/gui/itip-utils.c:344 calendar/gui/itip-utils.c:415
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr "Un organizer doit être configuré."
 
-#: calendar/gui/itip-utils.c:379
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Au moins un participant est nécessaire"
 
-#: calendar/gui/itip-utils.c:458 calendar/gui/itip-utils.c:567
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "Information événement"
 
-#: calendar/gui/itip-utils.c:460 calendar/gui/itip-utils.c:569
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "Informations de la tâche"
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "Informations du journal"
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:588
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "Information Libre-Occupé"
 
-#: calendar/gui/itip-utils.c:466
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Information calendrier"
 
-#: calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: calendar/gui/itip-utils.c:510
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Contre-proposition"
 
-#: calendar/gui/itip-utils.c:582
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Information Libre/Occupé (%s à %s)"
 
-#: calendar/gui/itip-utils.c:594
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "Information iCalendrier"
 
-#: calendar/gui/itip-utils.c:752
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Vous devez être inscrit comme participant à l'événement."
 
-#: calendar/gui/main.c:60
-msgid "Could not initialize GNOME"
-msgstr "Ne peut initialiser GNOME"
-
-#: calendar/gui/main.c:68
-msgid "Could not activate Bonobo"
-msgstr "Impossible d'activer Bonobo"
-
-#: calendar/gui/main.c:97
-msgid "Could not create the component editor factory"
-msgstr "Impossible de créer l'usine à éditeurs de composants"
-
-#: calendar/gui/print.c:455
-msgid "1st"
-msgstr "1er"
-
-#: calendar/gui/print.c:455
-msgid "2nd"
-msgstr "2ème"
-
-#: calendar/gui/print.c:455
-msgid "3rd"
-msgstr "3ème"
-
-#: calendar/gui/print.c:455
-msgid "4th"
-msgstr "4ème"
-
-#: calendar/gui/print.c:455
-msgid "5th"
-msgstr "5ème"
-
-#: calendar/gui/print.c:456
-msgid "6th"
-msgstr "6ème"
-
-#: calendar/gui/print.c:456
-msgid "7th"
-msgstr "7ème"
-
-#: calendar/gui/print.c:456
-msgid "8th"
-msgstr "8ème"
-
-#: calendar/gui/print.c:456
-msgid "9th"
-msgstr "9ème"
-
-#: calendar/gui/print.c:456
-msgid "10th"
-msgstr "10ème"
-
-#: calendar/gui/print.c:457
-msgid "11th"
-msgstr "11ème"
-
-#: calendar/gui/print.c:457
-msgid "12th"
-msgstr "12ème"
-
-#: calendar/gui/print.c:457
-msgid "13th"
-msgstr "13ème"
-
-#: calendar/gui/print.c:457
-msgid "14th"
-msgstr "14ème"
-
-#: calendar/gui/print.c:457
-msgid "15th"
-msgstr "15ème"
-
-#: calendar/gui/print.c:458
-msgid "16th"
-msgstr "16ème"
-
-#: calendar/gui/print.c:458
-msgid "17th"
-msgstr "17ème"
-
-#: calendar/gui/print.c:458
-msgid "18th"
-msgstr "18ème"
-
-#: calendar/gui/print.c:458
-msgid "19th"
-msgstr "19ème"
-
-#: calendar/gui/print.c:458
-msgid "20th"
-msgstr "20ème"
-
-#: calendar/gui/print.c:459
-msgid "21st"
-msgstr "21ème"
-
-#: calendar/gui/print.c:459
-msgid "22nd"
-msgstr "22ème"
-
-#: calendar/gui/print.c:459
-msgid "23rd"
-msgstr "23ème"
-
-#: calendar/gui/print.c:459
-msgid "24th"
-msgstr "24ème"
-
-#: calendar/gui/print.c:459
-msgid "25th"
-msgstr "25ème"
-
-#: calendar/gui/print.c:460
-msgid "26th"
-msgstr "26ème"
-
-#: calendar/gui/print.c:460
-msgid "27th"
-msgstr "27ème"
-
-#: calendar/gui/print.c:460
-msgid "28th"
-msgstr "28ème"
-
-#: calendar/gui/print.c:460
-msgid "29th"
-msgstr "29ème"
-
-#: calendar/gui/print.c:460
-msgid "30th"
-msgstr "30ème"
-
-#: calendar/gui/print.c:461
-msgid "31st"
-msgstr "31ème"
-
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "Di"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Je"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Jour sélectionné (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1887 calendar/gui/print.c:1891
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1888
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1892 calendar/gui/print.c:1894
-#: calendar/gui/print.c:1895
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1899
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semaine sélectionnée (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1907
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Mois sélectionné (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1914
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Année sélectionnée (%Y)"
 
-#: calendar/gui/print.c:2248
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "Tâche"
 
-#: calendar/gui/print.c:2305
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "État : %s"
 
-#: calendar/gui/print.c:2323
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorité : %s"
 
-#: calendar/gui/print.c:2337
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Pourcentage terminé : %i"
 
-#: calendar/gui/print.c:2349
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr "URL : %s"
 
-#: calendar/gui/print.c:2363
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr "Catégories : %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Contacts : "
 
-#: calendar/gui/print.c:2519 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:591 mail/mail-callbacks.c:3086
-#: my-evolution/e-summary.c:619
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "Aperçu Avant Impression"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Imprime cet élément"
 
-#: calendar/gui/print.c:2633
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Configuration de l'impression"
 
-#: calendar/gui/tasks-control-factory.c:74
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Ne peut créer la vue des tâches. Veuillez vérifier la \n"
-"configuration d'ORBit et d'OAF."
-
-#: calendar/gui/tasks-control.c:148
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "Les URI du dossier des tâches à afficher"
 
-#: calendar/gui/tasks-control.c:463
+#: calendar/gui/tasks-control.c:472
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6376,78 +6466,51 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment effacer les tâches ?"
 
-#: calendar/gui/tasks-control.c:470 mail/mail-callbacks.c:2581
-#: mail/mail-callbacks.c:2823
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "Ne plus me demander."
 
-#: calendar/gui/tasks-control.c:622
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr "Imprimer les tâches"
 
-#: calendar/gui/tasks-migrate.c:104
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-"Evolution a pris les tâches qui étaient dans votre dossier calendrier\n"
-"et les a automatiquement déplacées dans le nouveau dossier de tâches."
-
-#: calendar/gui/tasks-migrate.c:107
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-"Evolution a essayé de prendre les tâches qui étaient dans votre dossier "
-"calendrier\n"
-"et les a automatiquement déplacées dans le nouveau dossier de tâches.\n"
-"Quelques unes n'ont pas pu être importées, ce process essaiera à nouveau."
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
+msgid "SMTWTFS"
+msgstr "DLMMJVS"
 
-#: calendar/gui/tasks-migrate.c:119
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-"Ne peut ouvrir « %s » ; aucun item du dossier calendrier n'a pu être déplacé "
-"dans le dossier des tâches."
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Afficheur Calendrier iTip/iMip"
 
-#: calendar/gui/tasks-migrate.c:132
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-"La méthode demandée pour charger « %s » n'est pas supportée ; aucun item du "
-"dossier calendrier ne sera déplacé vers le dossier des tâches."
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Afficheur Calendrier iTip/iMip"
 
-#: calendar/gui/weekday-picker.c:307 calendar/gui/weekday-picker.c:404
-msgid "SMTWTFS"
-msgstr "DLMMJVS"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Afficheur Calendrier iTip/iMip"
 
-#: calendar/importers/icalendar-importer.c:166
-#, fuzzy, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr ""
-"Impossible d'obtenir le message : %s du dossier %s\n"
-"  %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Message Calendrier"
 
-#: calendar/importers/icalendar-importer.c:178
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:481
+#: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
 msgstr "Rappel !!"
 
-#: calendar/importers/icalendar-importer.c:695
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Évenements Calendrier"
 
-#: calendar/importers/icalendar-importer.c:720
+#: calendar/importers/icalendar-importer.c:663
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6455,10 +6518,14 @@ msgstr ""
 "Evolution a trouvé des fichiers Gnome Calendar.\n"
 "Voulez-vous les importer dans Evolution ?"
 
-#: calendar/importers/icalendar-importer.c:727
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Calendrier Gnome"
 
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now attend 0 argument"
@@ -8128,11 +8195,11 @@ msgstr "Le décodage n'est pas supporté par ce message chiffré"
 msgid "You may not export keys with this cipher"
 msgstr "Le décodage n'est pas supporté par ce message chiffré"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr "Impossible de créer le répertoire de cache"
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Impossible de supprimer l'entrée du cache : %s : %s"
@@ -8172,86 +8239,93 @@ msgstr "Préparation du dossier « %s » pour le hors-connexion"
 msgid "You must be working online to complete this operation"
 msgstr "Vous devez travailler en ligne pour terminer cette opération"
 
-#: camel/camel-filter-driver.c:767 camel/camel-filter-driver.c:776
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Impossible de mettre le message %s en cache : %s"
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-process.c:92
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Impossible de mettre le message %s en cache : %s"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Impossible de lire les salutations de %s : %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Synchronisation des dossiers"
 
-#: camel/camel-filter-driver.c:865 camel/camel-filter-driver.c:1238
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erreur analyse filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:874 camel/camel-filter-driver.c:1244
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur exécution du filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:941
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Impossible d'ouvrir le dossier de spool"
 
-#: camel/camel-filter-driver.c:950
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Ne peut traiter le dossier de spool"
 
-#: camel/camel-filter-driver.c:965
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Récupération du message %d (%d%%)"
 
-#: camel/camel-filter-driver.c:969
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Ne peut ouvrir le message"
 
-#: camel/camel-filter-driver.c:970 camel/camel-filter-driver.c:982
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Anomalie message %d"
 
-#: camel/camel-filter-driver.c:996 camel/camel-filter-driver.c:1090
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/camel-filter-driver.c:1057
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Récupération du message %d parmis %d"
 
-#: camel/camel-filter-driver.c:1072
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Anomalie message %d du %d"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr "Échec de la récupération du message"
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Arguments invalides"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Arguments invalides"
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Impossible de mettre le message %s en cache : %s"
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Impossible de mettre le message %s en cache : %s"
-
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur lors de la recherche filtrée : %s : %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8260,7 +8334,7 @@ msgstr ""
 "Ne peut pas analyser  l'expression de recherche : %s :\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8269,11 +8343,11 @@ msgstr ""
 "Erreur lors de l'exécution de l'expression de recherche : %s :\n"
 "%s"
 
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(compare tout) demande un unique résultat booléen"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Interrogation sur un en-tête inconnu : %s"
@@ -8329,9 +8403,9 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour \n"
 "débloquer la clé de l'utilisateur : « %s »"
 
-#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1246
-#: camel/camel-gpg-context.c:1353 camel/camel-gpg-context.c:1428
-#: camel/camel-gpg-context.c:1485 mail/mail-send-recv.c:544
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr "Annulé."
 
@@ -8352,7 +8426,7 @@ msgstr "Aucune donnée fournie"
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Impossible de crypter : aucun destinataire valide spécifié. "
 
-#: camel/camel-gpg-context.c:1122
+#: camel/camel-gpg-context.c:1125
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8360,24 +8434,24 @@ msgid ""
 "%.*s"
 msgstr "Impossible de GPG mettre le message %s en cache : %s"
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1131
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Impossible de mettre le message %s en cache : %s"
 
-#: camel/camel-gpg-context.c:1237 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1580
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Impossible d'exécuter gpg : %s"
 
-#: camel/camel-gpg-context.c:1267 camel/camel-gpg-context.c:1345
-#: camel/camel-gpg-context.c:1419 camel/camel-gpg-context.c:1449
-#: camel/camel-gpg-context.c:1476 camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
 msgid "Failed to execute gpg."
 msgstr "Impossible d'exécuter gpg. "
 
-#: camel/camel-gpg-context.c:1330
+#: camel/camel-gpg-context.c:1333
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8493,11 +8567,11 @@ msgstr "Impossible de décrypter la partie MIME: structure invalide"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Impossible de décrypter la partie MIME : erreur lors du parcours"
 
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr "Ceci est une partie de message numériquement signée"
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 msgid "parse error"
 msgstr "erreur lors du parcours"
 
@@ -8569,11 +8643,11 @@ msgstr ""
 "Cette option vous connectera au serveur en utilisant un mot de passe \n"
 "sécurisé CRAM-MD5 si le serveur le permet."
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8581,43 +8655,121 @@ msgstr ""
 "Cette option vous connectera au serveur en utilisant un mot de passe\n"
 "sécurisé  DIGEST-MD5 si le serveur le supporte."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Réponse du  serveur trop longue (>2048octets)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Réponse du serveur invalide\n"
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 "Le Challenge Serveur contient le token invalide « Quality of Protection »\n"
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr "La réponse du serveur ne contenait pas les données d'autorisation\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 "La réponse du serveur contenait des données d'autorisation incomplètes\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "La réponse du serveur ne correspond pas\n"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-gssapi.c:48
+msgid "GSSAPI"
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:50
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr ""
+"Cette option vous connectera au serveur IMAP en utilisant l'authentification/"
+"nKerberos 4 pour vous identifier."
+
+#: camel/camel-sasl-gssapi.c:148
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:153
+msgid "The provided target_name parameter was ill-formed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:156
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:160
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:165
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:169
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:180
+msgid "The consistency checks performed on the credential failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:183
+msgid "The referenced credentials have expired."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
+msgid "Bad authentication response from server."
+msgstr "Mauvaise réponse d'identification du serveur."
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Impossible de mettre le message %s en cache : %s"
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Tyoe non-supporté"
+
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant l'authentification/"
 "nKerberos 4 pour vous identifier."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8626,11 +8778,6 @@ msgstr ""
 "Ne peut obtenir l'étiquette Kerberos :\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr "Mauvaise réponse d'identification du serveur."
-
 #: camel/camel-sasl-login.c:32
 msgid "Login"
 msgstr "Login"
@@ -8680,7 +8827,7 @@ msgstr "POP avant authentification SMTP utilisant un transport inconnu"
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP avant authentification SMTP utilisant une source non-pop"
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Échec de compilation d'expression régulière : %s : %s"
@@ -8700,17 +8847,17 @@ msgstr "L'URL « %s »  nécessite un composant  « Host »"
 msgid "URL '%s' needs a path component"
 msgstr "L'URL « %s » nécessite un chemin"
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "Résolution de : %s"
 
-#: camel/camel-service.c:775 camel/camel-service.c:887
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Échec de la résolution du nom : %s"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Échec de la résolution de l'hôte : %s : hôte non trouvé"
@@ -8741,12 +8888,12 @@ msgid "For reading mail as a query of another set of folders"
 msgstr ""
 "Pour la lecture du courrier comme requête sur un autre ensemble de dossiers"
 
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:354 camel/camel-session.c:422
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Aucun fournisseur disponible pour le protocole « %s »"
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8792,135 +8939,135 @@ msgstr "Échec de décodage du message."
 msgid "Failed to verify certificates."
 msgstr "Échec de vérification des certificats."
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Impossible d'obtenir le dossier : Opération invalide sur ce stockage"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Impossible de créer le dossier : Opération invalide sur ce stockage"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Échec de vérification des certificats."
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr "Impossible d'obtenir la Liste de Révocation de Certificat"
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr "Impossible de décrypter la signature du certificat"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 "Impossible de décrypter la signature de la Liste de Révocation de Certificat"
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr "Échec de la signature du certificat"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Le certificat à expiré"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 #, fuzzy
 msgid "Error in CRL"
 msgstr "Erreur de chargement %s"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Manque de mémoire"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr "Impossible de vérifier la signature de la feuille"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr "Chaîne de certificat trop longue"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr "Certificat Révoqué"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr "Longueur de chemin dépassée"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr "Utilisation invalide"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "ID de Certificat : "
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr "Certificat rejeté"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr "L'utilisation de la clé ne permet pas la signature de certificat"
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:806
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8933,15 +9080,15 @@ msgstr ""
 "Empreinte  :        %s\n"
 "Signature  :        %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:812
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "BON"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:812
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "MAUVAIS"
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8961,7 +9108,7 @@ msgstr ""
 "Désirez-vous l'accepter quand même ?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:816
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8976,35 +9123,35 @@ msgstr ""
 "\n"
 "Désirez-vous accepter ?"
 
-#: camel/camel-tcp-stream-ssl.c:860
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:912
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:930
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:964
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr "La liste de révoquation des certificats est expirée : %s"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Ne peut analyser l'URL « %s »"
@@ -9019,40 +9166,40 @@ msgstr "Erreur lors du stockage de « %s » : %s"
 msgid "No such message %s in %s"
 msgstr "Pas de tel message %s dans %s"
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Impossible de copier ou déplacer des messages vers des dossiers virtuels"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossible de supprimer le dossier : %s : Opération invalide"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossible de supprimer le dossier : %s : Dossier inéxistant"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Impossible de renommer le dossier : %s : Opération invalide"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossible de renommer le dossier : %s : Dossier inexistant"
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:452
-#: camel/providers/imap/camel-imap-store.c:2656
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "Opération annulée"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2659
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveur déconnecté de manière inattendue : %s"
@@ -9077,45 +9224,45 @@ msgstr "Réponse inattendue du serveur IMAP : %s"
 msgid "IMAP command failed: %s"
 msgstr "Échec de la commande IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:462
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "La réponse du serveur s'est terminée trop tot."
 
-#: camel/providers/imap/camel-imap-command.c:654
+#: camel/providers/imap/camel-imap-command.c:655
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La réponse du serveur IMAP ne contient pas l'information %s"
 
-#: camel/providers/imap/camel-imap-command.c:690
+#: camel/providers/imap/camel-imap-command.c:691
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Réponse OK inattendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:221
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ne peut créer le répertoire %s : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:240
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ne peut charger le résumé pour %s"
 
-#: camel/providers/imap/camel-imap-folder.c:306
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "Le dossier a été détruit et recréé sur le serveur"
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:548
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Examen des messages modifiés"
 
-#: camel/providers/imap/camel-imap-folder.c:1872
+#: camel/providers/imap/camel-imap-folder.c:1873
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Impossible de rappatrier le message : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:225
 #: camel/providers/local/camel-maildir-folder.c:234
@@ -9131,24 +9278,24 @@ msgstr ""
 "Impossible d'obtenir le message : %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Aucun message correspondant"
 
-#: camel/providers/imap/camel-imap-folder.c:1932
-#: camel/providers/imap/camel-imap-folder.c:2528
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
 msgid "This message is not currently available"
 msgstr "Ce message n'est pas disponible"
 
-#: camel/providers/imap/camel-imap-folder.c:2192
-#: camel/providers/imap/camel-imap-folder.c:2262
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
 msgid "Fetching summary information for new messages"
 msgstr "Recherche des informations de résumé pour des nouveaux messages"
 
-#: camel/providers/imap/camel-imap-folder.c:2566
+#: camel/providers/imap/camel-imap-folder.c:2567
 msgid "Could not find message body in FETCH response."
 msgstr "Ne peut trouver le corps du message dans la réponse FETCH."
 
@@ -9178,7 +9325,7 @@ msgstr "Vérification si nouveau courrier"
 msgid "Check for new messages in all folders"
 msgstr "Vérifie les nouveaux messages dans tous les dossiers"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1156
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "Dossiers"
 
@@ -9208,7 +9355,7 @@ msgstr "Lecture et stockage du courrier sur des serveurs IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -9228,59 +9375,58 @@ msgstr "Serveur IMAP %s"
 msgid "IMAP service for %s on %s"
 msgstr "Service IMAP pour %s sur %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr "Connexion annulée"
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ne peut se connecter à %s (port %d) : %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Impossible de se connecter au serveur IMAP %s en mode sécurisé : %s"
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 msgid "SSL/TLS extension not supported."
 msgstr "Extension SSL/TSL non supportée"
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 msgid "SSL negotiations failed"
 msgstr " Échec des négociations SSL"
 
-#: camel/providers/imap/camel-imap-store.c:1082
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Le serveur IMAP %s ne supporte pas le mécanisme d'authetification de type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1092
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Pas de support pour les authentifications de type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1116
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe IMAP pour %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1131
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Vous n'avez pas saisi de mot de passe."
 
-#: camel/providers/imap/camel-imap-store.c:1160
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9291,25 +9437,25 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1505
-#: camel/providers/imap/camel-imap-store.c:1647
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr "Pas de tel dossier « %s »."
 
-#: camel/providers/imap/camel-imap-store.c:1848
+#: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 "Le nom de dossier « %s » est invalide car il contient le caractère « %c »"
 
-#: camel/providers/imap/camel-imap-store.c:1860
+#: camel/providers/imap/camel-imap-store.c:1851
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Dossier parent inconnu : %s"
 
-#: camel/providers/imap/camel-imap-store.c:1896
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Le dossier parent n'est pas autorisé à contenir des sous-dossiers"
 
@@ -9392,7 +9538,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La racine de stockage %s n'est pas un chemin absolu"
@@ -9418,7 +9564,7 @@ msgstr "Le stockage local n'a pas de boîte de réception"
 msgid "Local mail file %s"
 msgstr "Fichier de courrier local %s"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:907
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossible de renommer le dossier %s vers %s : %s"
@@ -9428,12 +9574,12 @@ msgstr "Impossible de renommer le dossier %s vers %s : %s"
 msgid "Could not rename '%s': %s"
 msgstr "Impossible de renommer « %s » : %s"
 
-#: camel/providers/local/camel-local-store.c:386
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Impossible de supprimer le fichier de résumé de dossier « %s » : %s"
 
-#: camel/providers/local/camel-local-store.c:396
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossible de supprimer le fichier d'index de dossier « %s » : %s"
@@ -9443,7 +9589,7 @@ msgstr "Impossible de supprimer le fichier d'index de dossier « %s » : %s"
 msgid "Could not save summary: %s: %s"
 msgstr "Impossible d'enregistrer le résumé : %s : %s"
 
-#: camel/providers/local/camel-local-summary.c:456
+#: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Impossible d'ajouter un message au résumé : raison inconnue"
 
@@ -9463,7 +9609,7 @@ msgstr "Contenu de message invalide"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9475,14 +9621,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Le dossier « %s » n'existe pas."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:169
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9507,9 +9653,9 @@ msgstr "Impossible de supprimer le dossier « %s » : %s"
 msgid "not a maildir directory"
 msgstr "n'est pas un répertoire maildir"
 
-#: camel/providers/local/camel-maildir-store.c:336
-#: camel/providers/local/camel-spool-store.c:283
-#: camel/providers/local/camel-spool-store.c:313
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Impossible de scruter le dossier « %s » : %s"
@@ -9529,10 +9675,10 @@ msgid "Checking for new messages"
 msgstr "Recherche de nouveaux messages"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:586
-#: camel/providers/local/camel-mbox-summary.c:677
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Ecriture du dossier"
 
@@ -9614,78 +9760,78 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Le dossier « %s » n'est pas vide. Non supprimé."
 
-#: camel/providers/local/camel-mbox-summary.c:351
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Impossible d'ouvrir le dossier : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:399
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Erreur fatale d'analyse du courrier prés de la position %ld dans le dossier %"
 "s"
 
-#: camel/providers/local/camel-mbox-summary.c:455
+#: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Impossible de vérifier le dossier : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:591
-#: camel/providers/local/camel-mbox-summary.c:682
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Impossible d'ouvrir le fichier : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:603
-#: camel/providers/local/camel-spool-summary.c:170
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ne peut ouvrir la boîte à lettres temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:616
-#: camel/providers/local/camel-mbox-summary.c:778
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Impossible de fermer le dossier source %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:625
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossible de fermer le dossier temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:636
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossible de renommer le dossier : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:720
-#: camel/providers/local/camel-mbox-summary.c:728
-#: camel/providers/local/camel-mbox-summary.c:919
-#: camel/providers/local/camel-mbox-summary.c:927
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Le résumé et le dossier ne correspondent pas, même après une synchronisation"
 
-#: camel/providers/local/camel-mbox-summary.c:853
-#: camel/providers/local/camel-spool-summary.c:342
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erreur inconnue : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:888
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Impossible de stocker le dossier : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:982
-#: camel/providers/local/camel-mbox-summary.c:1008
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erreur d'écriture dans la boite à lettres temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:999
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Échec d'écriture dans la boite à lettres temporaire : %s : %s"
@@ -9709,63 +9855,63 @@ msgstr "« %s » n'est pas un répertoire."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ne peut ouvrir le réperoire format MH : %s : %s"
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Le dossier spool « %s » ne peut être ouvert : %s"
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Le dossier spool « %s » n'est pas un fichier ou un répertoire normal"
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Le dossier « %s/%s » n'existe pas."
 
-#: camel/providers/local/camel-spool-store.c:177
+#: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "« %s » n'est pas un fichier de boîte aux lettres normal."
 
-#: camel/providers/local/camel-spool-store.c:194
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr "Le stockage ne supporte pas de boîte de réception"
 
-#: camel/providers/local/camel-spool-store.c:206
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Fichier de courrier spool %s"
 
-#: camel/providers/local/camel-spool-store.c:206
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Arbre de dossier spool %s"
 
-#: camel/providers/local/camel-spool-store.c:214
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Les dossiers spool  ne peuvent être renommés."
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Les dossiers spool  ne peuvent être effacés."
 
-#: camel/providers/local/camel-spool-summary.c:183
-#: camel/providers/local/camel-spool-summary.c:193
-#: camel/providers/local/camel-spool-summary.c:203
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Ne peut synchroniser le dossier de courrier temporaire %s : %s"
 
-#: camel/providers/local/camel-spool-summary.c:219
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Ne peut synchroniser le dossier de spool %s : %s"
 
-#: camel/providers/local/camel-spool-summary.c:250
-#: camel/providers/local/camel-spool-summary.c:269
-#: camel/providers/local/camel-spool-summary.c:282
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -9899,7 +10045,7 @@ msgstr "Ne pas effacer les messages du serveur"
 msgid "Delete after %s day(s)"
 msgstr "Supprime apès %s jour(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -9925,25 +10071,25 @@ msgstr ""
 "chiffré via le protocole APOP. Cela peut ne pas fonctionner pour tous les "
 "utilisateurs même si le serveur prétend pouvoir le supporter."
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Impossible de se connecter au serveur POP %s (port %d) : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Impossible de se connecter au serveur POP %s en mode sécurisé : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Impossible de se connecter au serveur POP %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9952,28 +10098,28 @@ msgstr ""
 "Impossible de se connecter au serveur POP %s : Aucun support pour le "
 "mécanisme d'identification demandé."
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL « %s » Identification échouée pour le serveur POP %s : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Impossible de vous identifier sur le serveur POP %s : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe POP3 pour %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:523
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9982,13 +10128,13 @@ msgstr ""
 "Impossible de se connecter au serveur POP %s.\n"
 "Erreur lors de l'envoi du mot de passe : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:615
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Aucun dossier « %s »."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10000,49 +10146,49 @@ msgstr ""
 "Pour délivrer le courrier en passant par le programme « sendmail » sur le "
 "système local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Erreur lors de l'analyse de la liste des déstinataires"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Ne peut créer de tube vers sendmail : %s : courrier non envoyé"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Ne peut cloner sendmail : %s : courrier non envoyé"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Impossible d'envoyer le message : %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail s'est terminé avec le signal %s : courrier non envoyé."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Ne peut exécuter %s : courrier non envoyé."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail s'est terrminé avec l'état %d : courrier non envoyé."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr "Livraison du courrier via le programme sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10052,136 +10198,136 @@ msgstr ""
 "Pour livrer le courrier en vous connectant à un distributeur distant "
 "utilisant SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "Erreur de syntaxe, commande non reconnue"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Erreur de syntaxe dans les paramètres ou les arguments"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Commande non implémentée"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Paramètre non implémenté"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Statut système, ou réponse à une aide système"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Message d'aide"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Service prêt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Service de fermeture du canal de transmission"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Service non disponible, fermeture du canal de transmission"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Action courrier demandée OK, terminé"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr "Utilisateur non local; transfèrera à <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Action courrier demandée non prise : boîte à lettres indisponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Action demandée non prise : boîte à lettres indisponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Action demandée abandonnée : erreur traitement"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr "Utilisateur non local; veuillez essayez <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Action demandée non prise : système de stockage insuffisant"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Action courrier demandée abandonnée : allocation de stockage excessif"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Action demandée non prise : nom de boîte à lettres non autorisé"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Démarre entrée courrier; fin avec <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "Échec de la transaction"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "Aucun mot de passe fourni"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Le mécanisme d'authentification est trop fragile"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Encryptage nécessaire pour  le mécanisme d'identification demandé."
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Anomalie authentification temporaire"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Identification requise"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr "Erreur lors de la réponse de bienvenue"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Impossible de se connecter au serveur SMTP %s en mode sécurisé : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:342
 msgid "server does not appear to support SSL"
 msgstr "le serveur ne semble pas supporter SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Requête STARTTLS expirée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr "Erreur de réponse STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "Le serveur SMTP %s ne supporte pas le type d'identification demandé %s. "
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe IMAP pour %s@%s"
@@ -10212,11 +10358,11 @@ msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Ne peut envoyer le message : l'adresse de l'expéditeur n'est pas valide"
 
-#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:615
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Envoi du message"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne peut envoyer le message : aucun destinataire n'est défini."
 
@@ -10224,61 +10370,61 @@ msgstr "Ne peut envoyer le message : aucun destinataire n'est défini."
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ne peut envoyer le message : un ou plusieurs déstinataires invalides."
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "Accueil SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "La demande HELO a expiré : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "HELO response error"
 msgstr "Erreur lors de la réponse HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "Identification SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Erreur création objet identification SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Demande AUTH expirée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "Erreur demande AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Mauvaise réponse d'identification du serveur.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Demande MAIL FROM dépassée : %s : courrier non envoyé"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr "Erreur réponse MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Demande RCPT TO expirée : %s : courrier non envoyé"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Echec de RCPT TO  <%s>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Demande DATA expirée : %s : courrier non envoyé."
@@ -10286,77 +10432,77 @@ msgstr "Demande DATA expirée : %s : courrier non envoyé."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 msgid "DATA response error"
 msgstr "Erreur réponse DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Envoi DATA expiré : Arrêt du message : %s : courrier non envoyé."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr "Erreur réponse de fin de DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Demande RSET dépassée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr "Erreur réponse RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "La requête QUIT a expiré : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr "Erreur réponse QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:219
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "pièce-jointe"
 
-#: composer/e-msg-composer-attachment-bar.c:502
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr "Supprimer les éléments sélectionnés de la liste des pièces-jointes"
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Ajouter une pièce-jointe..."
 
-#: composer/e-msg-composer-attachment-bar.c:533
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Joindre un fichier au message"
 
-#: composer/e-msg-composer-attachment.c:167
-#: composer/e-msg-composer-attachment.c:183
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Impossible d'attacher ke fichier %s : %s"
 
-#: composer/e-msg-composer-attachment.c:175
+#: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -10375,11 +10521,15 @@ msgid "MIME type:"
 msgstr "Type MIME :"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:67
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr "Suggérer l'affichage automatique de la pièce jointe"
 
-#: composer/e-msg-composer-hdrs.c:361
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
@@ -10390,45 +10540,45 @@ msgstr "Cliquez ici pour le carnet d'adresses"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Répondre-à :"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:404
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "De :"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: composer/e-msg-composer-hdrs.c:424
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "À :"
 
-#: composer/e-msg-composer-hdrs.c:425
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Saisissez les destinataires du message"
 
-#: composer/e-msg-composer-hdrs.c:428
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc :"
 
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Saisissez les adresses qui recevront une copie carbone de ce message"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc :"
 
-#: composer/e-msg-composer-hdrs.c:433
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10439,27 +10589,27 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:440
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:442
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "Pas de description"
 
-#: composer/e-msg-composer-select-file.c:103
-#: composer/e-msg-composer-select-file.c:120
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
 msgstr "Joindre un fichier"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "Impossible de créer un contexte de signature PGP"
 
-#: composer/e-msg-composer.c:785
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10468,30 +10618,30 @@ msgstr ""
 "Erreur durant la lecture du fichier %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Le fichier existe, l'écraser ?"
 
-#: composer/e-msg-composer.c:1183
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erreur accès au fichier : %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Ne peut récupérer le message de l'éditeur"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10500,7 +10650,7 @@ msgstr ""
 "Ne peut rechercher dans le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10509,7 +10659,7 @@ msgstr ""
 "Ne peut tronquer le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1285
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10518,7 +10668,7 @@ msgstr ""
 "Ne peut rechercher dans le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10527,7 +10677,7 @@ msgstr ""
 "Erreur lors de l'auto-enregistrement du message : %s :\n"
 " %s"
 
-#: composer/e-msg-composer.c:1376
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10535,7 +10685,7 @@ msgstr ""
 "Evolution a trouvé des fichiers non enregistrés d'une session précédente.\n"
 "Voulez-vous essayer de les récupérer ?"
 
-#: composer/e-msg-composer.c:1537
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10546,27 +10696,32 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1555
+msgid "_Discard Changes"
+msgstr ""
+
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Avertissement : Message modifié"
 
-#: composer/e-msg-composer.c:1573
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "Signature : "
 
-#: composer/e-msg-composer.c:1972 mail/mail-account-gui.c:1226
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2156 composer/e-msg-composer.c:2776
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:2807
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10574,7 +10729,7 @@ msgstr ""
 "Impossible de créer la fenête de composition:\n"
 "Impossible d'activer le composant de sélection d'adresse."
 
-#: composer/e-msg-composer.c:2833
+#: composer/e-msg-composer.c:2931
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10586,7 +10741,7 @@ msgstr ""
 "Veuillez vous assurer que vous avez les bonnes\n"
 "versions de gtkhtml et libgtkhtml. \n"
 
-#: composer/e-msg-composer.c:2893
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10594,7 +10749,7 @@ msgstr ""
 "Impossible de créer la fenêtre de composition :\n"
 "Ne peut activer le composant « Editeur HTML »."
 
-#: composer/e-msg-composer.c:3874
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10602,18 +10757,6 @@ msgstr ""
 "<b>(Le composeur contient un corps de message non textuel qui ne peut être "
 "édité.)<b>"
 
-#: composer/evolution-composer.c:407
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"Ne peut créer une fenêtre de composition de message parce que vous \n"
-"n'avez pas encore configuré d'identités dans le composant courrier."
-
-#: composer/evolution-composer.c:422
-msgid "Cannot initialize the Evolution composer."
-msgstr "Impossible d'initialiser l'éditeur d'Evolution"
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "La suite de travail collaboratif Evolution"
@@ -10662,7 +10805,111 @@ msgstr "Le sujet contient"
 msgid "Subject does not contain"
 msgstr "Le sujet ne contient pas"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2446
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:4
+#, fuzzy
+msgid "<b>Out of Office Message:</b>"
+msgstr "Hors du bureau"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Débute : </b> "
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:12
+#, fuzzy
+msgid "Out of Office Assistant"
+msgstr "Hors du bureau"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "État des marqueurs"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "Réception des messages"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "Envoi du message"
+
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:9
+#, fuzzy
+msgid "Read Receipts"
+msgstr "Destinataires"
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
+#: e-util/e-component-listener.c:128
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10670,19 +10917,23 @@ msgstr ""
 "Un fichier ayant le même nom existe.\n"
 "L'écraser ?"
 
-#: e-util/e-passwords.c:331
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Écraser le fichier ?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Se souvenir du mot de passe"
 
-#: e-util/e-passwords.c:333
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Se souvenir de ce mot de passe pour le reste de cette session"
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr "Synchroniser les enregistrements privés : "
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 msgid "Sync Categories:"
 msgstr "Synchroniser les catégories"
 
@@ -10757,13 +11008,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1630
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1627
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10772,42 +11023,74 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:65 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:181
-msgid "seconds"
-msgstr "secondes"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 seconde"
+
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d secondes"
+
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 minute"
 
 #: filter/filter-datespec.c:66
-msgid "minute"
-msgstr "minute"
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d minutes"
 
 #: filter/filter-datespec.c:67
-msgid "hour"
-msgstr "heure"
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 heure"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d heures"
+
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 jour"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr "%d %s passé(e)s"
 
 #: filter/filter-datespec.c:69
-msgid "week"
-msgstr "semaine"
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 semaine"
 
-#: filter/filter-datespec.c:69 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "semaines"
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d semaines"
 
 #: filter/filter-datespec.c:70
-msgid "month"
+#, fuzzy
+msgid "1 month ago"
 msgstr "mois"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:23
-msgid "months"
-msgstr "mois"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr "%d %s passé(e)s"
 
 #: filter/filter-datespec.c:71
-msgid "year"
-msgstr "an"
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:71 filter/filter.glade.h:33
-msgid "years"
-msgstr "années"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr "%d %s passé(e)s"
 
 #: filter/filter-datespec.c:176
 msgid "You must choose a date."
@@ -10826,13 +11109,7 @@ msgstr "maintenant"
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:298 filter/filter-datespec.c:301
-#, c-format
-msgid "%d %s ago"
-msgstr "%d %s passé(e)s"
-
-#: filter/filter-datespec.c:417
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Sélectionnez une heure pour la comparaison"
 
@@ -10850,7 +11127,7 @@ msgstr "Vous devez spécifier un nom de fichier"
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Le fichier « %s » n'existe pas ou n'est pas un fichier normal."
 
-#: filter/filter-file.c:293
+#: filter/filter-file.c:298
 msgid "Choose a file"
 msgstr "Choisir un fichier"
 
@@ -10859,13 +11136,13 @@ msgstr "Choisir un fichier"
 msgid "Then"
 msgstr "Alors"
 
-#: filter/filter-folder.c:153
+#: filter/filter-folder.c:155
 #, fuzzy
 msgid "You must specify a folder."
 msgstr "Vous devez spécifier un dossier. \n"
 
-#: filter/filter-folder.c:241 filter/vfolder-rule.c:406
-#: mail/mail-account-gui.c:1459 mail/mail-account-gui.c:1473
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "Sélectionnez un Dossier"
 
@@ -10878,70 +11155,72 @@ msgstr ""
 "Erreur dans l'expression régulière « %s » :\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:64
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
 msgid "Important"
 msgstr "Important"
 
 #. red
-#: filter/filter-label.c:122 mail/mail-config.c:65
-#: mail/mail-config.glade.h:133
+#: filter/filter-label.c:122 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 msgid "Work"
 msgstr "Travail"
 
 #. orange
-#: filter/filter-label.c:123 mail/mail-config.c:66 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1281
 msgid "Personal"
 msgstr "Personnel"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:67
-#: mail/mail-config.glade.h:124
+#: filter/filter-label.c:124 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 msgid "To Do"
 msgstr "À faire"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:68 mail/mail-config.glade.h:67
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1283
 msgid "Later"
 msgstr "Plus tard"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:62
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:218
+#: filter/filter-rule.c:219
 msgid "You must name this filter."
 msgstr "Vous devez changer le nom de ce dossier virtuel."
 
-#: filter/filter-rule.c:750
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Nom de la règle : "
 
-#: filter/filter-rule.c:754
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "SansTitre"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:789
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "Exécuter les actions"
 
-#: filter/filter-rule.c:793
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "si tous les critères sont remplis"
 
-#: filter/filter-rule.c:798
+#: filter/filter-rule.c:799
 msgid "if any criteria are met"
 msgstr "si un des critères est rempli"
 
-#: filter/filter-rule.c:893
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "entrant"
 
-#: filter/filter-rule.c:893
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "sortant"
 
@@ -11001,6 +11280,14 @@ msgstr "une date relative à la date en cours"
 msgid "ago"
 msgstr "passé(e)s"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "mois"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "secondes"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "Dossiers spécifiques seulement"
@@ -11017,6 +11304,10 @@ msgstr "une date que vous spécifiez"
 msgid "vFolder Sources"
 msgstr "Sources de Dossier Virtuel"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "semaines"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "Avec tous les dossiers actifs distants"
@@ -11029,6 +11320,10 @@ msgstr "Avec tous les dossiers actifs locaux et distants"
 msgid "with all local folders"
 msgstr "Avec tous les dossiers locaux"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "années"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11051,289 +11346,296 @@ msgid "Beep"
 msgstr "Bip"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contient"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copier vers le dossier"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Date de réception"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Date d'envoi"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Supprimé"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr "N'existe pas"
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "Brouillon"
+msgid "does not contain"
+msgstr "ne contient pas"
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr "Existe"
+msgid "does not end with"
+msgstr "ne finit pas par"
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr "Expression"
+msgid "does not exist"
+msgstr "n'existe pas"
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
-msgstr "Donner suite"
+msgid "does not return"
+msgstr "ne retourne pas"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1772
-msgid "Label"
-msgstr "Étiquette"
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "ne ressemble pas à"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "ne commence pas par"
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
-msgstr "Liste de diffusion"
+msgid "Do Not Exist"
+msgstr "N'existe pas"
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr "Corps du message"
+msgid "Draft"
+msgstr "Brouillon"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "En-tête du message"
+msgid "ends with"
+msgstr "finit par"
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "Déplacer vers le dossier"
+msgid "Exist"
+msgstr "Existe"
 
 #: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
-msgstr "Envoyer le Message dans une Commande Shell"
+msgid "exists"
+msgstr "existe"
 
 #: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr "Jouer un son"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:57
-msgid "Read"
-msgstr "Lu"
+msgid "Expression"
+msgstr "Expression"
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "Destinataires"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr "Donner suite"
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr "Regex correspond"
+msgid "is"
+msgstr "est"
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr "Répondu à"
+msgid "is after"
+msgstr "est aprés"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Score"
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "est avant"
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1768
-msgid "Sender"
-msgstr "Expéditeur"
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr "est Marqué"
 
 #: filter/libfilter-i18n.h:31
-msgid "Set Status"
-msgstr "Définir l'état"
+msgid "is greater than"
+msgstr "est plus grand que"
 
 #: filter/libfilter-i18n.h:32
-msgid "Shell Command"
-msgstr "Commande Shell"
+msgid "is less than"
+msgstr "est inférieur à"
 
 #: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "Taille (ko)"
+msgid "is not"
+msgstr "n'est pas"
 
 #: filter/libfilter-i18n.h:34
-msgid "Source Account"
-msgstr "Compte source"
+msgid "is not Flagged"
+msgstr "n'est pas Marqué"
 
-#: filter/libfilter-i18n.h:35
-msgid "Specific header"
-msgstr "En-tête spécifique"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
+msgid "Label"
+msgstr "Étiquette"
+
+#: filter/libfilter-i18n.h:36
+msgid "Mailing list"
+msgstr "Liste de diffusion"
 
 #: filter/libfilter-i18n.h:37
-msgid "Stop Processing"
-msgstr "Arrête le traitement"
+msgid "Message Body"
+msgstr "Corps du message"
 
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:917
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
-msgid "Subject"
-msgstr "Sujet"
+#: filter/libfilter-i18n.h:38
+msgid "Message Header"
+msgstr "En-tête du message"
 
 #: filter/libfilter-i18n.h:39
-msgid "Unset Status"
-msgstr "Statut Non Défini"
+msgid "Move to Folder"
+msgstr "Déplacer vers le dossier"
 
 #: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "contient"
+msgid "Pipe Message to Shell Command"
+msgstr "Envoyer le Message dans une Commande Shell"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "ne contient pas"
+msgid "Play Sound"
+msgstr "Jouer un son"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "ne finit pas par"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Lu"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "n'existe pas"
+msgid "Recipients"
+msgstr "Destinataires"
 
 #: filter/libfilter-i18n.h:44
-msgid "does not return"
-msgstr "ne retourne pas"
+msgid "Regex Match"
+msgstr "Regex correspond"
 
 #: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "ne ressemble pas à"
+msgid "Replied to"
+msgstr "Répondu à"
 
 #: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "ne commence pas par"
+msgid "returns"
+msgstr "retourne"
 
 #: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "finit par"
+#, fuzzy
+msgid "returns greater than"
+msgstr "est plus grand que"
 
 #: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "existe"
+#, fuzzy
+msgid "returns less than"
+msgstr "est inférieur à"
 
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "est Marqué"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Score"
 
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "est aprés"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
+msgid "Sender"
+msgstr "Expéditeur"
 
 #: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "est avant"
+msgid "Set Status"
+msgstr "Définir l'état"
 
 #: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "est plus grand que"
+msgid "Shell Command"
+msgstr "Commande Shell"
 
 #: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "est inférieur à"
+msgid "Size (kB)"
+msgstr "Taille (ko)"
 
 #: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "n'est pas Marqué"
+msgid "sounds like"
+msgstr "ressemble à"
 
 #: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "n'est pas"
+msgid "Source Account"
+msgstr "Compte source"
 
 #: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "est"
+msgid "Specific header"
+msgstr "En-tête spécifique"
 
 #: filter/libfilter-i18n.h:57
-#, fuzzy
-msgid "returns greater than"
-msgstr "est plus grand que"
-
-#: filter/libfilter-i18n.h:58
-#, fuzzy
-msgid "returns less than"
-msgstr "est inférieur à"
+msgid "starts with"
+msgstr "Débute par"
 
 #: filter/libfilter-i18n.h:59
-msgid "returns"
-msgstr "retourne"
+msgid "Stop Processing"
+msgstr "Arrête le traitement"
 
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "ressemble à"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
+msgid "Subject"
+msgstr "Sujet"
 
 #: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "Débute par"
-
-#: filter/rule-editor.c:169
-msgid "Rules"
-msgstr "Règles"
+msgid "Unset Status"
+msgstr "Statut Non Défini"
 
-#: filter/rule-editor.c:240 filter/rule-editor.c:316
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:283
+#: filter/rule-editor.c:170
+msgid "Rules"
+msgstr "Règles"
+
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Ajouter une règle"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "Éditer la règle"
 
-#: filter/rule-editor.c:663
+#: filter/rule-editor.c:689
 #, fuzzy
-msgid "Rule(s)"
-msgstr "Règles"
+msgid "Rule name"
+msgstr "Nom de la règle : "
 
-#: filter/score-editor.c:113
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr "Règles des scores"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "Vous devez nommer ce dossier virtuel."
 
-#: filter/vfolder-rule.c:220
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr "Vous devez spécifier au moins un dossier comme source."
 
-#: filter/vfolder-rule.c:520
+#: filter/vfolder-rule.c:499
 #, fuzzy
-msgid "Folder(s)"
-msgstr "Dossiers"
+msgid "VFolder source"
+msgstr "Sources de Dossier Virtuel"
 
-#: importers/elm-importer.c:95
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importe vos anciens courriers Elm"
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr "Importation..."
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr "Veuillez attendre"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importation de %s comme %s"
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, c-format
 msgid "Scanning %s"
 msgstr "Scrutation de %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:104
-#: mail/folder-browser-ui.c:354
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
 msgstr "Courrier"
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11341,7 +11643,7 @@ msgstr ""
 "Evolution a trouvé des fichiers courrier Elm\n"
 "Voulez-vous les importer dans Evoltion ?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11353,12 +11655,12 @@ msgstr ""
 "Evolution a trouvé des fichiers GnomeCard.\n"
 "Voulez-vous les importer dans Evolution ?"
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Priorité : %s"
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11373,7 +11675,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11381,7 +11683,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11390,38 +11692,40 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importe vos anciennes données Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1094
-#: shell/e-local-storage.c:185
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Corbeille"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Fichier de courrier local %s"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr "Scrutation du répertoire"
 
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Début importation :"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Réglages"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr "Filtres de Courrier"
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11429,11 +11733,11 @@ msgstr ""
 "Evolution a trouvé des fichiers courrier Netscape.\n"
 "Voulez-vous les importer dans Evolution ?"
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importe d'ancienne données Pine"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -11441,124 +11745,121 @@ msgstr ""
 "Evolution a trouvé des fichiers courrier Pine\n"
 "Voulez-vous les importer dans Evolution ?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr "Préférences de l'éditeur"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Contrôle de configuration pour les polices d'afichage d'Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Contrôle de configuration pour les comptes de courrier d'Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Contrôle de configuration pour le courrier d'Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Contrôle de configuration pour l'éditeur de message d'Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure the fonts used by Evolution here"
 msgstr "Configurez ici les polices utilisées par Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Composant Evolution pour le traitement du courrier."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Usine pour le contrôle de configuration du Résumé Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Evolution mail composer."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
 msgstr "Éditeur de courrier d'Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Composant « Résumé » d'Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Éditeur de courrier d'Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Composant d'affichage de dossier courrier."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Usine pour le contrôle de configuration du Résumé Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Usine à composants pour les dossiers de courrier."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Interface de configuration de la messagerie"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Composant d'affichage de dossier courrier."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Utilitaire composeur de messagerie d'Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Usine pour le contrôle de configuration du Résumé Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "Utilitaire pour le composant de résumé de messagerie."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Composant « Résumé » d'Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
 msgstr "Préférences des Polices"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 msgid "Mail Accounts"
 msgstr "Comptes de courrier"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr "Préférences du courrier"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr "Interface de configuration de la messagerie"
-
-#: mail/component-factory.c:104
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Dossier contenant du courrier"
 
-#: mail/component-factory.c:105
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Courrier Public"
 
-#: mail/component-factory.c:105
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Dossier public contenant du courrier"
 
-#: mail/component-factory.c:106
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Corbeille Virtuelle"
 
-#: mail/component-factory.c:106
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Dossier de corbeille Virtuelle"
 
-#: mail/component-factory.c:134
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Ce dossier ne peut contenir de messages."
 
-#: mail/component-factory.c:428
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Propriétés..."
 
-#: mail/component-factory.c:428
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Modifier les propriétés de ce dossier"
 
-#: mail/component-factory.c:808
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11566,238 +11867,224 @@ msgstr ""
 "Certains de vos règlages de messagerie semblent corrompus, vérifiez que tout "
 "est en ordre."
 
-#: mail/component-factory.c:973
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Vous n'avez pas défini de méthode de transport de courrier"
 
-#: mail/component-factory.c:997
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1039
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Nouveau message électronique"
 
-#: mail/component-factory.c:1039
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_Message électronique"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "Composer un nouveau message"
 
-#: mail/component-factory.c:1048
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Message _suivant"
 
-#: mail/component-factory.c:1048
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr "Poster le Message"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "Poster un nouveau message électronique"
 
-#: mail/component-factory.c:1077
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Impossible d'initialiser le composant de messagerie d'Evolution."
-
-#: mail/component-factory.c:1086
-msgid "Cannot initialize Evolution's mail config component."
-msgstr ""
-"Ne peut initialiser le composant de configuration de messagerie d'Evolution."
-
-#: mail/component-factory.c:1092
-msgid "Cannot initialize Evolution's folder info component."
-msgstr ""
-"Impossible d'initialiser le composant d'information des dossiers d'Evolution"
-
-#: mail/component-factory.c:1333 mail/component-factory.c:1363
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: mail/component-factory.c:1374
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Ne peut enregistrer le stockage avec le shell"
 
-#: mail/folder-browser-ui.c:481
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriétés de « %s »"
 
-#: mail/folder-browser-ui.c:483
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Propriétés"
 
-#: mail/folder-browser.c:313 mail/mail-display.c:378 mail/mail-display.c:885
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ne peut créer de répertoire temporaire : %s"
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d nouveaux"
 
-#: mail/folder-browser.c:771 mail/folder-browser.c:779
-#: mail/folder-browser.c:782
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr "%d cachés"
 
-#: mail/folder-browser.c:775
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr "%d visibles"
 
-#: mail/folder-browser.c:780
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr "%d sélectionnés"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d non envoyés"
 
-#: mail/folder-browser.c:787
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "%d envoyés"
 
-#: mail/folder-browser.c:789
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "%d au total"
 
-#: mail/folder-browser.c:1128
+#: mail/folder-browser.c:1182
 msgid "Create _Virtual Folder From Search..."
 msgstr "Créer un dossier _virtuel à partir d'une recherche..."
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xpéditeur"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "Dossier virtuel sur la liste de diffusion"
 
-#: mail/folder-browser.c:1715
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:1716
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Filtre sur l'expéditeur"
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Filtre sur les destinataires"
 
-#: mail/folder-browser.c:1718 mail/folder-browser.c:2041
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "_Editer comme nouveau  message..."
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: mail/folder-browser.c:1742 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Répondre à l'expéditeur"
 
-#: mail/folder-browser.c:1743 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
-#: mail/folder-browser.c:1744 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr "_Donner suite..."
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1771
 msgid "Fla_g Completed"
 msgstr "Marquer _Achevé"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1772
 msgid "Cl_ear Flag"
 msgstr "_Effacer les marqueurs"
 
 #. separator here?
-#: mail/folder-browser.c:1755 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: mail/folder-browser.c:1756
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Marquer comme _Important"
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr "Marquer comme Non Im_portant"
 
-#: mail/folder-browser.c:1763
+#: mail/folder-browser.c:1784
 msgid "U_ndelete"
 msgstr "_Récupérer"
 
-#: mail/folder-browser.c:1767
+#: mail/folder-browser.c:1788
 msgid "Mo_ve to Folder..."
 msgstr "Déplacer _vers le dossier..."
 
-#: mail/folder-browser.c:1768 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: mail/folder-browser.c:1776
+#: mail/folder-browser.c:1797
 msgid "Add Sender to Address_book"
 msgstr "Ajouter l'expéditeur au _carnet d'adresses"
 
-#: mail/folder-browser.c:1780
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr "Appliquer les _filtres"
 
-#: mail/folder-browser.c:1784
+#: mail/folder-browser.c:1805
 msgid "Crea_te Rule From Message"
 msgstr "Créer une _règle à partir du message"
 
-#: mail/folder-browser.c:2042
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr "Dossier virtuel sur la liste de _diffusion"
 
-#: mail/folder-browser.c:2044
+#: mail/folder-browser.c:2066
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtre sur la _liste de diffusion (%s)"
 
-#: mail/folder-browser.c:2045
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Dossier virtuel sur la liste de _diffusion (%s)"
@@ -11810,21 +12097,37 @@ msgstr "Défaut"
 msgid "Getting Folder Information"
 msgstr "Récupération des informations dossier"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Utilitaire pour importer mbox dans Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Éditeur de courrier d'Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importe des fichiers mbox dans Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Éditeur de courrier d'Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Utilitaire pour importer du courrier Outlook Express dans Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importe des fichiers Outlook Express 4 dans Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Éditeur de courrier d'Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Éditeur de courrier d'Evolution"
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -11861,70 +12164,65 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:103
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr "Vous n'avez pas saisi toutes les informations requises."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:147
+#: mail/mail-account-editor.c:146
 msgid "Evolution Account Editor"
 msgstr "Éditeur de compte d'Evolution"
 
-#: mail/mail-account-gui.c:739 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Nom d'utilisateur : "
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_Chemin :"
 
-#: mail/mail-account-gui.c:1834
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Vous ne devez pas créer deux comptes avec le même nom."
 
-#: mail/mail-accounts.c:225 mail/mail-accounts.c:236
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce compte ?"
 
-#: mail/mail-accounts.c:230 mail/mail-accounts.c:240
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "De pas supprimer"
 
-#: mail/mail-accounts.c:243
-msgid "Really delete account?"
-msgstr "Effacer réellement le compte ?"
-
-#: mail/mail-accounts.c:379 mail/mail-accounts.c:413
-#: mail/mail-composer-prefs.c:632 mail/mail-composer-prefs.c:661
-#: mail/mail-composer-prefs.c:691
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr "Désactiver."
 
-#: mail/mail-accounts.c:381 mail/mail-accounts.c:415
-#: mail/mail-composer-prefs.c:634 mail/mail-composer-prefs.c:659
-#: mail/mail-composer-prefs.c:691
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr "Activer"
 
-#: mail/mail-accounts.c:478
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
 #, fuzzy
 msgid "[Default]"
 msgstr "Défaut"
 
-#: mail/mail-accounts.c:548 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:55
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr "Activé"
 
-#: mail/mail-accounts.c:549 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Nom de Compte"
 
-#: mail/mail-accounts.c:550 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -11967,7 +12265,12 @@ msgstr ""
 "    « %s »\n"
 "Et ont été mis à jour."
 
-#: mail/mail-callbacks.c:156
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Ne plus afficher ce message."
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11979,7 +12282,16 @@ msgstr ""
 "recevoir ou composer des courriers.\n"
 "Voulez-vous le configurer maintenant ?"
 
-#: mail/mail-callbacks.c:199
+#: mail/mail-callbacks.c:211
+#, fuzzy
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Vous devez configurer une identité\n"
+"avant de pouvoir composer un message."
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11987,7 +12299,7 @@ msgstr ""
 "Vous devez configurer une identité\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:212
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11996,7 +12308,7 @@ msgstr ""
 "avant de pouvoir composer un message."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:254
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
@@ -12005,17 +12317,11 @@ msgstr ""
 "vous assurer que les destinataires suivants veulent et peuvent recevoir\n"
 "du courrier HTML: \n"
 
-#: mail/mail-callbacks.c:250
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Envoyer tout de même ?"
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:255 mail/mail-callbacks.c:283
-#: mail/mail-callbacks.c:326 widgets/misc/e-messagebox.c:226
-msgid "Don't show this message again."
-msgstr "Ne plus afficher ce message."
-
-#: mail/mail-callbacks.c:282
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12023,7 +12329,7 @@ msgstr ""
 "Ce message n'a pas de sujet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: mail/mail-callbacks.c:314
+#: mail/mail-callbacks.c:313
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -12031,11 +12337,11 @@ msgstr ""
 "Depuis que la liste de contacts que vous envoyez est configurée pour cacher "
 "la liste d'adresses, ce message contiendra seulement des destinataires Bcc."
 
-#: mail/mail-callbacks.c:318
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "Le message contient seulement des destinataires Bcc"
 
-#: mail/mail-callbacks.c:324
+#: mail/mail-callbacks.c:322
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -12045,12 +12351,12 @@ msgstr ""
 "en ajoutant un en-tête Apparently-To.\n"
 "Envoyer quand même ?"
 
-#: mail/mail-callbacks.c:462
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "Vous devez spécifier des destinataires afin de pouvoir envoyer ce message."
 
-#: mail/mail-callbacks.c:723
+#: mail/mail-callbacks.c:722
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -12058,28 +12364,28 @@ msgstr ""
 "Impossible d'ouvrir le dossier brouillons pour ce compte.\n"
 "Voulez-vous utiliser le dossier brouillons générique ?"
 
-#: mail/mail-callbacks.c:1154
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "Un expéditeur inconnu"
 
-#: mail/mail-callbacks.c:1158
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Le %a %d/%m/%Y à %H:%M,  %%s a écrit :"
 
-#: mail/mail-callbacks.c:1648 mail/message-browser.c:137
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "Déplacez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1650 mail/message-browser.c:139
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:2291
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Êtes-vous sûr de vouloir éditer tous les %d messages  ?"
 
-#: mail/mail-callbacks.c:2316
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12087,7 +12393,7 @@ msgstr ""
 "Vous ne pouvez éditer des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:2355
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12095,43 +12401,46 @@ msgstr ""
 "Vous ne pouvez renvoyer des messages que\n"
 "lorsqu'ils sont dans le dossier Envoyés."
 
-#: mail/mail-callbacks.c:2369
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Êtes-vous sûr de vouloir renvoyer tous les %d messages ?"
 
-#: mail/mail-callbacks.c:2395
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Aucun message sélectionné"
 
-#: mail/mail-callbacks.c:2440 mail/mail-display.c:189
-msgid "Overwrite file?"
-msgstr "Écraser le fichier ?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Impossible d'obtenir le message : %s\n"
+"  %s"
+
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Un fichier ayant le même nom existe.\n"
+"L'écraser ?"
 
-#: mail/mail-callbacks.c:2495
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/mail-callbacks.c:2497
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Enregistrer les messages sous..."
 
-#: mail/mail-callbacks.c:2566
-msgid "Go to next folder with unread messages?"
-msgstr "Aller au dossier suivant conntenant des messages non lus ?"
-
-#: mail/mail-callbacks.c:2573
-msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-"Il n'y a plus de nouveau messages dans ce dossier.\n"
-"Voulez-vous aller au dossier suivant ?"
-
-#: mail/mail-callbacks.c:2816
+#: mail/mail-callbacks.c:2687
+#, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12140,7 +12449,7 @@ msgstr ""
 "\n"
 "Effacer réellement ces messages ?"
 
-#: mail/mail-callbacks.c:2923
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12149,60 +12458,64 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:2936
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtres"
 
-#: mail/mail-callbacks.c:2978
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d parmis %d"
 
-#: mail/mail-callbacks.c:3032
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:3093
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Échec de l'impression du message"
 
-#: mail/mail-callbacks.c:3285
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Êtes-vous sûr de vouloir ouvrir tous les %d messages dans une fenêtre "
 "séparée ?"
 
-#: mail/mail-composer-prefs.c:217
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+msgid "Unnamed"
+msgstr "Sans nom"
+
+#: mail/mail-composer-prefs.c:335
 #, fuzzy
-msgid ""
-"Please specify signature filename\n"
-"in Advanced section of signature settings."
-msgstr ""
-"Veuillez spécifier un fichier de signature\n"
-"dans la section avancée de la configuration\n"
-"des signatures."
+msgid "You must specify a valid script name."
+msgstr "Vous devez spécifier un nom de fichier"
 
-#: mail/mail-composer-prefs.c:231 mail/mail-composer-prefs.c:233
-#: mail/mail-composer-prefs.c:357 mail/mail-composer-prefs.c:404
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
 #, fuzzy
 msgid "[script]"
 msgstr " [script]"
 
-#: mail/mail-composer-prefs.c:302
+#: mail/mail-composer-prefs.c:864
 #, fuzzy
-msgid "You must specify a valid script name."
-msgstr "Vous devez spécifier un nom de fichier"
-
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2572
-msgid "Unnamed"
-msgstr "Sans nom"
+msgid "Language(s)"
+msgstr "Langue"
 
-#: mail/mail-composer-prefs.c:871
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Ajouter une signature script"
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-composer-prefs.c:926
+#, fuzzy
+msgid "Signature(s)"
+msgstr "Signatures"
+
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Identité"
+
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12213,7 +12526,12 @@ msgstr ""
 "que vous ne désiriez inclure ces informations dans les messages que vous "
 "envoyez."
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "_Réception des Messages"
+
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12222,11 +12540,16 @@ msgstr ""
 "vous n'êtes pas sûr, demandez à votre administrateur système ou à votre "
 "fournisseur d'accès Internet."
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Veuillez sélectionnez parmi les options suivantes"
 
-#: mail/mail-config-druid.c:156
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Envoi des Me_ssages"
+
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12235,7 +12558,11 @@ msgstr ""
 "vous n'êtes pas sûr, demandez à votre administrateur système ou à votre "
 "fournisseur d'accès Internet."
 
-#: mail/mail-config-druid.c:158
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Gestionnaire de comptes"
+
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12249,21 +12576,11 @@ msgstr ""
 "Veuillez saisir un nom pour ce compte dans l'espace ci-dessous. Ce nom sera "
 "utilisé uniquement dans un but d'affichage."
 
-#. set window title
-#: mail/mail-config-druid.c:643
-msgid "Evolution Account Assistant"
-msgstr "Assistant de compte d'Evolution"
-
-#: mail/mail-config.c:599
-#, c-format
-msgid "Account %d"
-msgstr "Compte %d"
-
-#: mail/mail-config.c:2263
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Service de vérification"
 
-#: mail/mail-config.c:2341 mail/mail-config.c:2344
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "Connexion au serveur"
 
@@ -12279,14 +12596,10 @@ msgstr "(SSL n'est pas supporté dans cette compilation d'évolution)"
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL n'est pas supporté dans cette compilation d'évolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Toujours crypter pour moi lors de l'envoi de courrier crypté"
 
-#: mail/mail-config.glade.h:7
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr ""
-
 #: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr "Éditeur de compte"
@@ -12295,10 +12608,6 @@ msgstr "Éditeur de compte"
 msgid "Account Information"
 msgstr "Information du compte"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Gestionnaire de comptes"
-
 #: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
 msgstr "Ajouter un Sc_ript"
@@ -12381,13 +12690,14 @@ msgid "Configuration"
 msgstr "Configuration"
 
 #: mail/mail-config.glade.h:33
+#, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
 "Félicitations, votre configuration de la messagerie est maintenant "
 "terminée.\n"
@@ -12424,7 +12734,7 @@ msgstr "Ne pas citer le message d'origine"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Fait"
 
@@ -12453,210 +12763,215 @@ msgstr "_Adresse électronique : "
 msgid "Empty _trash folders on exit"
 msgstr "Vider les dossiers corbeille en sor_tant"
 
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Assistant de compte d'Evolution"
+
 #: mail/mail-config.glade.h:56
+msgid "Execute Command..."
+msgstr "Exécuter une commande..."
+
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Largeur fi_xe : "
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Font Properties"
 msgstr "Propriétés de la Police"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Format messages in _HTML"
 msgstr "Formater les messages en _HTML"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "Obtenir un ID numérique..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Mettre les citations en _surbrillance avec"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Identité"
-
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "En ligne"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Étiquettes et couleurs"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Chargement des images"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
+msgid "Mailbox location"
+msgstr "Localisation de la boîte à lettres"
+
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Éditeur de messages"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Affichage du message"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Le message contient"
+
+#: mail/mail-config.glade.h:76
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Notification du courrier entrant"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "On Screen fonts"
-msgstr ""
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Informations optionnelles"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Or_ganization:"
 msgstr "Or_ganisation : "
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _clé PGP : "
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Demander lors de l'envois de messages où seuls des destinataires BCC sont "
 "définis"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "Printed Fonts"
 msgstr "Polices Imprimées"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Répertoire de courrier Qmail"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "Quote original message"
 msgstr "Citer le message d'origine"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Cité"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "Se souvenir du mot de passe"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr "Ré_pondre-À : "
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "Réception des messages"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "Receiving _Options"
 msgstr "_Options de Réception"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr "Mémoriser ce mot de _passe"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Informations requises"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "Restore Defaults"
 msgstr "Restaurer les Valeurs par Défaut"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "S_écurité"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME sécurisé (S/MIME)"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "Envoi du message"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Dossier des _messages envoyés : "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Messages envoyés et brouillons"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Le serveur nécessite une identification"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "_Type de serveur : "
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr "_Type de raccourcis : "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr "Spécifiez le nom de _fichier : "
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr "Langage de Correction Orthographique"
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "_Correction Orthographique"
@@ -12692,10 +13007,11 @@ msgid "V_ariable-width:"
 msgstr "Largeur-variable : "
 
 #: mail/mail-config.glade.h:129
+#, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 "Bienvenue dans l'assistant de configuration de courrier d'Evolution.\n"
 "\n"
@@ -12763,105 +13079,111 @@ msgid "_Enable"
 msgstr "Activ_er"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "Style de transfert : "
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Nom complet :"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "Courrier _HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_Identité"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 "_Charger les images si l'expéditeur est présent dans le carnet d'adresses"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "En faire _mon compte par défaut"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Marquer les messages comme lus après"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Ne jamais charger les images hors du réseau"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "Jouer un fichier son lorsque du nouveau courrier arrive"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Demander lors de l'envoi de messages HTML à des contacts qui n'en veulent "
 "_pas"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Demander lors de l'envoi de messages dé_pourvu de sujet"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Réception des Messages"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "Style de réponse  : "
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "_Restaurer les valeurs par défaut"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Script : "
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Envoi des Me_ssages"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Afficher le_s images animées"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Signatures"
 
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Sand Point"
+
 #: mail/mail-config.glade.h:175
-msgid "_Use secure connection (SSL):"
-msgstr "_Utilisez une connexion sécurisée (SSL) : "
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Contact initial : "
 
 #: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "Largeur-variable : "
+msgid "_Use secure connection (SSL):"
+msgstr "_Utilisez une connexion sécurisée (SSL) : "
 
 #: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "_toutes les"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "couleur"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "description"
 
@@ -12885,7 +13207,7 @@ msgstr "Ne peut créer un contexte d'enveloppe S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Ne peut créer un contexte de décodage S/MIME."
 
-#: mail/mail-display.c:186
+#: mail/mail-display.c:193
 #, fuzzy, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -12894,70 +13216,70 @@ msgstr ""
 "Un fichier ayant le même nom existe.\n"
 "L'écraser ?"
 
-#: mail/mail-display.c:318
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Enregistrer la pièce-jointe"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:406
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Ne peut créer le fichier temporaire : « %s » : %s"
 
-#: mail/mail-display.c:439
+#: mail/mail-display.c:454
 msgid "Save Attachment..."
 msgstr "Enregistrer la Pièce-Jointe..."
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Voir en ligne"
 
-#: mail/mail-display.c:441
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Voir en ligne (via %s)"
 
-#: mail/mail-display.c:500
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Cacher"
 
-#: mail/mail-display.c:520
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Visualiseur externe"
 
-#: mail/mail-display.c:1299
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr "Chargement des images"
 
-#: mail/mail-display.c:1476
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Chargement contenu de message"
 
-#: mail/mail-display.c:1777
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr "Retard : "
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1883
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "par %B %d, %Y, %I:%M %P"
 
-#: mail/mail-display.c:2123
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Ouvrir un lien dans le Navigateur"
 
-#: mail/mail-display.c:2124
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Copier l'emplacement du lien"
 
-#: mail/mail-display.c:2126
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Enregistrer le lien sous (FIXME)"
 
-#: mail/mail-display.c:2128
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Enregistrer l'image sous..."
 
@@ -12966,91 +13288,91 @@ msgstr "Enregistrer l'image sous..."
 msgid "Pinging %s"
 msgstr "Scrutation de %s"
 
-#: mail/mail-format.c:648
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "pièce-jointe %s"
 
-#: mail/mail-format.c:691 mail/mail-format.c:1709 mail/mail-format.c:1778
-#: mail/mail-format.c:1898 mail/mail-format.c:2023 mail/mail-format.c:2048
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossible d'analyser le message MIME. Afficher comme source"
 
-#: mail/mail-format.c:769 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Date"
 
-#: mail/mail-format.c:854
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Mauvaise adresse"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
-#: mail/message-tags.glade.h:3
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Répondre-À :"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "À"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1821
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Ce message est signé numériquement. Cliquez sur l'icône de verrou pour plus "
 "d'information."
 
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1479
 msgid "Could not create a PGP verfication context"
 msgstr "Impossible de créer un contexte de vérification PGP"
 
-#: mail/mail-format.c:1857
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Ce message est signé numériquement et a été certifié authentique."
 
-#: mail/mail-format.c:1865
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Ce message est signé numériquement mais ne peut être certifié authentique."
 
-#: mail/mail-format.c:2129
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointeur sur le site FTP (%s)"
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pointeur sur le fichier local (%s) valide sur le site « %s »"
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointeur sur le fichier local (%s)"
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointeur sur des données distantes (%s)"
 
-#: mail/mail-format.c:2177
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointeur sur des données externes inconnues (« %s » type)"
 
-#: mail/mail-format.c:2179
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Partie corps externe malformée"
 
@@ -13059,11 +13381,11 @@ msgstr "Partie corps externe malformée"
 msgid "Local folders/%s"
 msgstr "Dossiers locaux/%s"
 
-#: mail/mail-local.c:669
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Reconfiguration du dossier"
 
-#: mail/mail-local.c:750
+#: mail/mail-local.c:748
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13072,22 +13394,22 @@ msgstr ""
 "Impossible d'enregistrer les méta-informations du dossier; vous \n"
 "ne pouvez plus ouvrir ce dossier : %s : %s"
 
-#: mail/mail-local.c:806
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Impossible d'enregistrer les méta-informations du dossier dans %s : %s"
 
-#: mail/mail-local.c:858
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Impossible de supprimer les méta-informations du dossier %s : %s"
 
-#: mail/mail-local.c:1328
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Changement du dossier « %s » vers le format « %s »"
 
-#: mail/mail-local.c:1350
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13095,16 +13417,16 @@ msgstr ""
 "Si vous ne pouvez plus ouvrir cette boîte aux lettres, \n"
 "vous aurez besoin de la réparer manuellement."
 
-#: mail/mail-local.c:1449
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigure /%s"
 
-#: mail/mail-local.c:1513
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr "Vous ne pouvez modifier le format d'un dossier non local"
 
-#: mail/mail-mt.c:255
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13113,7 +13435,7 @@ msgstr ""
 "Erreur durant « %s » :\n"
 "%s"
 
-#: mail/mail-mt.c:258
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13122,108 +13444,108 @@ msgstr ""
 "Erreur durant l'exécution de l'opération :\n"
 "%s"
 
-#: mail/mail-mt.c:900
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Travail en cours"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtrage du dossier"
 
-#: mail/mail-ops.c:266
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Rapatriement du courrier"
 
-#: mail/mail-ops.c:552 mail/mail-ops.c:581
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
 msgstr ">Toutefois, le message a été correctement envoyé."
 
-#: mail/mail-ops.c:613
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Expédition de « %s »"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Envoi du message %d du %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Echec sur le message %d parmis %d"
 
-#: mail/mail-ops.c:752 mail/mail-send-recv.c:548
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
 msgid "Complete."
 msgstr "Terminé"
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Enregistrement du message dans le dossier"
 
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Déplacement des messages vers %s"
 
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copie des messages vers %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scrutation des dossiers dans « %s »"
 
-#: mail/mail-ops.c:1227
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Messages suivis"
 
-#: mail/mail-ops.c:1270
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1342
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du stockage %s"
 
-#: mail/mail-ops.c:1415
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Effacement du dossier %s"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ecriture du dossier « %s »"
 
-#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Rafraichissement du dossier"
 
-#: mail/mail-ops.c:1596
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: mail/mail-ops.c:1645
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Récupération du message %s"
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Récupération de %d message(s)"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Enregistrement de %d message(s)"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13232,7 +13554,7 @@ msgstr ""
 "Ne peut créer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13241,11 +13563,11 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Enregistrement de la pièce-jointe"
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13254,54 +13576,54 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ne peut écrire les données : %s"
 
-#: mail/mail-ops.c:2212
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Déconnexion de %s"
 
-#: mail/mail-ops.c:2212
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnexion à %s"
 
-#: mail/mail-search-dialogue.c:120 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "Rechercher"
-
-#: mail/mail-search.c:139
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Message sans tître)"
 
-#: mail/mail-search.c:242
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Message sans tître"
 
-#: mail/mail-search.c:246
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Message vide"
 
-#: mail/mail-search.c:295
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Trouver dans le message"
 
-#: mail/mail-search.c:328
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "Rechercher"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Sensible à la casse"
 
-#: mail/mail-search.c:330
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "Recherche vers l'avant"
 
-#: mail/mail-search.c:350
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Rechercher : "
 
-#: mail/mail-search.c:353
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Correspond :"
 
@@ -13309,64 +13631,64 @@ msgstr "Correspond :"
 msgid "Cancelling..."
 msgstr "Annulation..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveur : %s, Type : %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Chemin : %s, Type : %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: mail/mail-send-recv.c:298
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr "Envoyer & Recevoir le courrier"
 
-#: mail/mail-send-recv.c:300
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "Annuler tout"
 
-#: mail/mail-send-recv.c:359
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "Mise à jour..."
 
-#: mail/mail-send-recv.c:360 mail/mail-send-recv.c:413
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
 msgid "Waiting..."
 msgstr "Attente..."
 
-#: mail/mail-session.c:212
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulé la requête"
 
-#: mail/mail-session.c:245 mail/mail-session.c:339
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: mail/mail-session.c:247 mail/mail-session.c:342
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
-#: mail/mail-session.c:260 mail/mail-session.c:281
+#: mail/mail-session.c:280
 msgid "_Remember this password"
 msgstr "Se _souvenir du mot de passe"
 
-#: mail/mail-session.c:261 mail/mail-session.c:282
+#: mail/mail-session.c:281
 msgid "_Remember this password for the remainder of this session"
 msgstr "Mémo_riser ce mot de passe pour le reste de cette session"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-signature-editor.c:80
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Ne peut enregistrer le fichier de signature : %s"
 
-#: mail/mail-signature-editor.c:176
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13376,46 +13698,50 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: mail/mail-signature-editor.c:179
+#: mail/mail-signature-editor.c:229
+msgid "_Discard changes"
+msgstr ""
+
+#: mail/mail-signature-editor.c:233
 msgid "Save signature"
 msgstr "Enregistrer la signature"
 
-#: mail/mail-signature-editor.c:324
+#: mail/mail-signature-editor.c:389
 msgid "Edit signature"
 msgstr "Éditer la signature"
 
-#: mail/mail-signature-editor.c:360
+#: mail/mail-signature-editor.c:429
 msgid "Enter a name for this signature."
 msgstr "Saisissez un nom pour cette signature."
 
-#: mail/mail-signature-editor.c:363 my-evolution/e-summary-preferences.c:621
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Nom :"
 
-#: mail/mail-tools.c:261
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Message suivi - %s"
 
-#: mail/mail-tools.c:263
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Message suivi"
 
-#: mail/mail-tools.c:412
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Message suivi"
 
-#: mail/mail-vfolder.c:79
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Mise en place du dossier virtuel : %s"
 
-#: mail/mail-vfolder.c:197
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Mise à jours des dossiers virutels pour l'URI : %s"
 
-#: mail/mail-vfolder.c:444
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13428,97 +13754,97 @@ msgstr ""
 "        « %s »\n"
 "Et ont été mis à jour."
 
-#: mail/mail-vfolder.c:753 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:810
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:850
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Éditer le dossier virtuel"
 
-#: mail/mail-vfolder.c:868
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tentative d'édition du dossier virtuel « %s » qui n'existe pas."
 
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
-#: mail/message-browser.c:213
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Pas de sujet)"
 
-#: mail/message-browser.c:215
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Message"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "Non vu"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "Vu"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Répondu"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "Messages non vus multiples"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "Messages multiples"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "Plus bas"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "Plus haut"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "Le plus haut"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %H:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %H:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2578
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Generation de la liste des messages"
 
@@ -13551,43 +13877,43 @@ msgstr "Reçu"
 msgid "Size"
 msgstr "Taille"
 
-#: mail/message-tag-followup.c:51
+#: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Appel"
 
-#: mail/message-tag-followup.c:52
+#: mail/message-tag-followup.c:63
 msgid "Do Not Forward"
 msgstr "Ne pas faire suivre"
 
-#: mail/message-tag-followup.c:53
+#: mail/message-tag-followup.c:64
 msgid "Follow-Up"
 msgstr "Donner suite"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:65
 msgid "For Your Information"
 msgstr "Pour votre information"
 
-#: mail/message-tag-followup.c:55 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Faire suivre"
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
 msgstr "Pas de réponse nécessaire"
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Répondre"
 
-#: mail/message-tag-followup.c:59 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Répondre à tous"
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:71
 msgid "Review"
 msgstr "Revoir"
 
-#: mail/message-tag-followup.c:241 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr "Marquer à donner suite"
 
@@ -13624,43 +13950,34 @@ msgstr "Scrutation des dossiers sous  %s dans « %s »"
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Scrutation des dossiers de niveau root dans « %s »"
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnement au dossier « %s »"
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Désabonnement du dossier « %s »"
 
-#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Dossier"
 
-#: mail/subscribe-dialog.c:1440
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Analyse des dossiers..."
 
-#: mail/subscribe-dialog.c:1547
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Aucun serveur n'a été sélectionné"
 
-#: mail/subscribe-dialog.c:1622
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Veuillez sélectionner un serveur."
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "All folders"
-msgstr "Tous les dossiers"
-
-#: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Apri file"
-msgstr "Avril"
-
-#: mail/subscribe-dialog.glade.h:5 ui/evolution-comp-editor.xml.h:2
+#: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -13669,39 +13986,49 @@ msgstr "Avril"
 msgid "Close"
 msgstr "Fermer"
 
-#: mail/subscribe-dialog.glade.h:6
-msgid "Display Options"
-msgstr "Options d'Affichage"
-
-#: mail/subscribe-dialog.glade.h:7
-msgid "Folders whose names begin with:"
-msgstr "Dossiers dont les noms commencent par :"
-
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:4
 msgid "Manage Subscriptions"
 msgstr "Gérer les abonnements"
 
-#: mail/subscribe-dialog.glade.h:9 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Rafraîchir la liste"
 
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:6
 msgid "S_elect server: "
 msgstr "Sél_ectionnez un serveur : "
 
-#: mail/subscribe-dialog.glade.h:11
-#, fuzzy
-msgid "Salve file"
-msgstr "Sélectionner un fichier"
-
-#: mail/subscribe-dialog.glade.h:12
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_S'abonner"
 
-#: mail/subscribe-dialog.glade.h:13
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "Se _désabonner"
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
+msgid "Configure the appearance of the Evolution Summary here"
+msgstr "Configurez ici l'apparence du Résumé Evolution"
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Composant Résumé d'Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Summary component"
+msgstr "Composant Résumé d'Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Usine pour le contrôle de configuration du Résumé Evolution"
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
+msgid "Summary Preferences"
+msgstr "Préférence du Résumé"
+
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
 msgstr "Aarhus"
@@ -18792,4780 +19119,4777 @@ msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
 #: my-evolution/Locations.h:1325
-msgid "Marquette"
-msgstr "Marquette"
-
-#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Airport"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Airport"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Airport"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Middle East"
 msgstr "Middle East"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
 msgstr "Miyakejima Airport"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Airport"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Airport"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannée"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
 msgstr "Moscow Domodedovo"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
 msgstr "Moscow Sheremetyevo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr "Mont Wilson"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr "Mont Washington"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr "Munchen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Airport"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
 msgstr "Nagoya (Aéroprt)"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
 msgstr "Naha (Aéroport)"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Airport"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama Airport"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr "Nantes Atlantique"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Naples"
 msgstr "Naples"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Mexico"
 msgstr "Nouveau Mexique"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Orleans"
 msgstr "Nouvelle Orléans"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
 msgstr "New Tokyo International Airport"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
 msgstr "Niigata (Aéroport)"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr "Caroline du Nord"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Dakota"
 msgstr "Dakota du nord"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr "Philadelphie (Nord-est)"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr "Kingstown (Nord)"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
 msgstr "Obihiro Airport"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odesa"
 msgstr "Odesa"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
 msgstr "Oita Airport"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
 msgstr "Okayama (Aéroport)"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
 msgstr "Oki (Aéroport)"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr "Osaka International Airport"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
 msgstr "Oshima Airport"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr "Pennsylvanie"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
 msgstr "Chine (République populaire de)"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr "Philadelphie"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Apt"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
 msgid "Rivne"
 msgstr "Rivne"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Vallée de Seine"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 msgid "Russia"
 msgstr "Russie"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
 msgid "Sendai Airport"
 msgstr "Sendai Airport"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O International Airport"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr "Sept-Îles"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr "Seville"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr "Dakota du Sud"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
 msgid "Sympheropol"
 msgstr "Sympheropol"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Airport"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
 msgid "Tallinn"
 msgstr "Tallinn"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr "Tanegashima Airport"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr "Tehran-Mehrabad"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr "Tokyo International Airport"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr "Tokyo New International Airport"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 msgid "Tottori Airport"
 msgstr "Tottori Airport"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
 msgstr "Toyama Airport"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
 msgstr "Tsushima Airport"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
 msgid "United Arab Emirates "
 msgstr "Émirats Arabes Unis"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
 msgid "Uzhgorod"
 msgstr "Uzhgorod"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech Airport"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser Airport"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Airport"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
 msgstr "Yamagata Airport"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube Airport"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
 msgid "Yao Airport"
 msgstr "Yao Airport"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr "Dossier contenant le résumé d'Evolution"
 
-#: my-evolution/e-summary-calendar.c:377 my-evolution/e-summary-calendar.c:397
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "Rendez-vous"
 
-#: my-evolution/e-summary-calendar.c:378
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Pas de rendez-vous"
 
-#: my-evolution/e-summary-calendar.c:414
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:416
-msgid "%l:%M %d %B"
+#: my-evolution/e-summary-calendar.c:407
+#, fuzzy
+msgid "%l:%M%P %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:434
+#: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr "Pas de description"
 
-#: my-evolution/e-summary-mail.c:156
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Résumé de courrier"
 
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1113
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Dossiers locaux"
 
-#: my-evolution/e-summary-preferences.c:355
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionnary.com du jour"
 
-#: my-evolution/e-summary-preferences.c:373
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr "Citations du jour"
 
-#: my-evolution/e-summary-preferences.c:611
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Ajouter un serveur de news"
 
-#: my-evolution/e-summary-preferences.c:617
+#: my-evolution/e-summary-preferences.c:621
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Saisissez l'URL du serveur de news que vous voulez ajouter"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "Erreur lors du téléchargement des données RDF"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Serveur de forums"
 
-#: my-evolution/e-summary-shown.c:521
+#: my-evolution/e-summary-shown.c:518
 msgid "All"
 msgstr "Tous"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:533
+#: my-evolution/e-summary-shown.c:530
 msgid "Add"
 msgstr "Ajouter"
 
-#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Montré"
 
-#: my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Aucune tâche"
 
-#: my-evolution/e-summary-tasks.c:371
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(Aucune description)"
 
@@ -23573,11 +23897,11 @@ msgstr "(Aucune description)"
 msgid "My Weather"
 msgstr "Ma Météo"
 
-#: my-evolution/e-summary-weather.c:269
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr "Il y a eu une erreur lors du téléchargement des données pour"
 
-#: my-evolution/e-summary-weather.c:490
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Météo"
 
@@ -23585,31 +23909,26 @@ msgstr "Météo"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:592
+#: my-evolution/e-summary-weather.c:584
 msgid "KBOS"
 msgstr "KPRX"
 
-#: my-evolution/e-summary.c:199
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%A %d %B %Y"
 
-#: my-evolution/e-summary.c:514
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "Veuillez patienter..."
 
-#: my-evolution/e-summary.c:592 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimer le résumé"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Échec de l'impression du résumé"
 
-#: my-evolution/main.c:63
-#, fuzzy
-msgid "Evolution Summary"
-msgstr "Composant Résumé d'Evolution."
-
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -24876,23 +25195,24 @@ msgstr "_Planifier"
 msgid "_Weather"
 msgstr "_Météo"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for Evolution folder settings."
-msgstr "Contrôle de configuration pour les dossiers par défaut d'Evolution."
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Le shell Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Usine pour le contrôle de configuration du Résumé Evolution"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 msgid "Folder Settings"
 msgstr "Paramètres de Dossier"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "Le shell Evolution."
-
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Afficher les détails"
@@ -24910,55 +25230,37 @@ msgstr ""
 "Impossible de transférer le dossier :\n"
 "%s"
 
-#: shell/e-folder-list.c:123 shell/evolution-folder-selector-button.c:129
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "« %s » dans « %s »"
 
-#: shell/e-folder-list.c:325
+#: shell/e-folder-list.c:338
 msgid "Add a Folder"
 msgstr "Ajouter un Dossier"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:179
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: shell/e-local-storage.c:181 shell/e-shell-view.c:488
-#: shell/e-shell-view.c:492 shell/e-shortcuts.c:1075
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#: shell/e-local-storage.c:182
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Boîte d'expédition"
 
-#: shell/e-local-storage.c:183
+#: shell/e-local-storage.c:182
 msgid "Sent"
 msgstr "Envoyé"
 
-#: shell/e-setup.c:128
-msgid "Evolution installation"
-msgstr "Installation d'Evolution"
-
-#: shell/e-setup.c:132
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Cette nouvelle version d'Evolution a besoin d'installer des fichiers "
-"supplémentaires dans votre répertoire personnel d'Evolution."
-
-#: shell/e-setup.c:133
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Veuillez cliquez sur « Valider » pour installer les fichiers, ou « Annuler » "
-"pour quitter."
-
-#: shell/e-setup.c:173
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Ne peut mettre à jour les fichiers correctement"
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24969,7 +25271,7 @@ msgstr ""
 "%s\n"
 "Erreur : %s"
 
-#: shell/e-setup.c:211
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -24978,41 +25280,7 @@ msgstr ""
 "Une erreur est survenue durant la copie des fichiers dans\n"
 "« %s »."
 
-#: shell/e-setup.c:284
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution n'a pas pu créer le répertoire\n"
-"%s : \n"
-"%s"
-
-#: shell/e-setup.c:302
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-"Le répertoire %s\n"
-"n'a pas les permissions. Veuillez le rendre lisible\n"
-"et traversable, puis relancer Evolution."
-
-#: shell/e-setup.c:308
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-"Le fichier %s\n"
-"devrait être supprimer pour permettre à Evolution de \n"
-"fonctionner correctement. Veuillez le supprimer et \n"
-"relancer Evolution."
-
-#: shell/e-setup.c:331
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25023,21 +25291,7 @@ msgstr ""
 "Déplacez le afin de permettre l'installation\n"
 "des fichiers utilisateur d'Evolution."
 
-#: shell/e-setup.c:345
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-"Evolution a détecté un vieux\n"
-"répertoire Executive-Summary.\n"
-"Il a besoin d'être effacé avant\n"
-"le lancement d'Evolution.\n"
-"Voulez-vous supprimer ce répertoire ?"
-
-#: shell/e-setup.c:370
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25052,7 +25306,7 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Amené sur votre bureau par"
 
-#: shell/e-shell-config-autocompletion.c:112
+#: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
 msgstr "Date d'Achèvement"
@@ -25074,47 +25328,47 @@ msgstr "Dossiers Hors-Connexion"
 msgid "Autocompletion Folders"
 msgstr "Date d'Achèvement"
 
-#: shell/e-shell-folder-commands.c:141
+#: shell/e-shell-folder-commands.c:140
 #, c-format
 msgid "Cannot copy folder: %s"
 msgstr "Impossible de copier le dossier : %s"
 
-#: shell/e-shell-folder-commands.c:144
+#: shell/e-shell-folder-commands.c:142
 #, c-format
 msgid "Cannot move folder: %s"
 msgstr "Impossible de déplacer le dossier : %s"
 
-#: shell/e-shell-folder-commands.c:191
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Ne peut déplacer un répertoire sur lui même."
 
-#: shell/e-shell-folder-commands.c:193
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Ne peut copier un dossier sur lui même."
 
-#: shell/e-shell-folder-commands.c:207
+#: shell/e-shell-folder-commands.c:204
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Ne peut déplacer un répertoire sur un de ses descendant."
 
-#: shell/e-shell-folder-commands.c:322
+#: shell/e-shell-folder-commands.c:319
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Spécifier un dossier pour y copier le dossier  « %s » :"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Copier le dossier"
 
-#: shell/e-shell-folder-commands.c:366
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Spécifier un dossier pour y déplacer le dossier  « %s » :"
 
-#: shell/e-shell-folder-commands.c:370
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Déplacer le dossier"
 
-#: shell/e-shell-folder-commands.c:394
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25123,17 +25377,17 @@ msgstr ""
 "Ne peut supprimer le dossier :\n"
 "« %s »"
 
-#: shell/e-shell-folder-commands.c:407
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Supprimer « %s »"
-
-#: shell/e-shell-folder-commands.c:408
+#: shell/e-shell-folder-commands.c:405
 #, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Réellement effacer le dossier « %s » ? "
 
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Supprimer « %s »"
+
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25142,26 +25396,26 @@ msgstr ""
 "Ne peut supprimer le dossier :\n"
 "« %s »"
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renommer le dossier « %s » en : "
 
-#: shell/e-shell-folder-commands.c:543
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Renommer le dossier"
 
-#: shell/e-shell-folder-commands.c:553
-#: shell/e-shell-folder-creation-dialog.c:169
+#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-creation-dialog.c:170
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Le nom de dossier spécifié n'est pas valide : %s"
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:583
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:590
+#: shell/e-shell-folder-commands.c:586
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25170,7 +25424,7 @@ msgstr ""
 "Impossible de supprimer le dossier :\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
+#: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25179,19 +25433,19 @@ msgstr ""
 "Ne peut créer le dossier spécifié :\n"
 "« %s »"
 
-#: shell/e-shell-folder-creation-dialog.c:292
+#: shell/e-shell-folder-creation-dialog.c:308
 msgid "Create New Folder"
 msgstr "Créer un Nouveau Dossier"
 
-#: shell/e-shell-folder-title-bar.c:648 shell/e-shell-folder-title-bar.c:649
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr "Choisissez l'outil d'importation à lancer"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -25205,11 +25459,11 @@ msgstr ""
 "Vous pouvez sélectionner « Automatique » si vous l'ignorez, et Evolution "
 "essaiera de l'utiliser."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:816
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Veuillez sélectionner les informations que vous désirez importer :"
 
-#: shell/e-shell-importer.c:245 shell/e-shell-importer.c:276
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25218,21 +25472,21 @@ msgstr ""
 "Importation %s\n"
 "Importation élément %d."
 
-#: shell/e-shell-importer.c:350
+#: shell/e-shell-importer.c:351
 msgid "Select importer"
 msgstr "Sélectionnez un outil d'import"
 
-#: shell/e-shell-importer.c:488
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "Le fichier « %s » n'existe pas"
 
-#: shell/e-shell-importer.c:489 shell/e-shell-importer.c:506
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
 #: shell/e-shell-importer.c:552
 msgid "Evolution Error"
 msgstr "Erreur Evolution"
 
-#: shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25241,11 +25495,11 @@ msgstr ""
 "Il n'y a pas d'outils d'import capable de traiter\n"
 "%s."
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Importation"
 
-#: shell/e-shell-importer.c:520
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25254,7 +25508,7 @@ msgstr ""
 "Importation %s.\n"
 "Lancement %s"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Erreur au lancement de %s"
@@ -25297,7 +25551,7 @@ msgstr "Importer les données et règlages d'autres programmes"
 msgid "Import a single file"
 msgstr "Importer un seul fichier"
 
-#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:642
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25305,32 +25559,32 @@ msgstr ""
 "Veuillez attendre...\n"
 "Recherche des paramétrages existants"
 
-#: shell/e-shell-importer.c:783 shell/e-shell-startup-wizard.c:645
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Importateurs intelligents de démarrage"
 
-#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:770
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "De %s :"
 
-#: shell/e-shell-importer.c:1077
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Sélectionnez un Dossier"
 
-#: shell/e-shell-importer.c:1078
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Sélectionnez un dossier de destination pour importer ces données"
 
-#: shell/e-shell-importer.c:1190 shell/importer/intelligent.c:191
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Importer"
 
-#: shell/e-shell-offline-handler.c:584
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Fermeture des connexions..."
 
-#: shell/e-shell-offline-sync.c:160
+#: shell/e-shell-offline-sync.c:163
 #, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -25339,91 +25593,92 @@ msgstr ""
 "Erreur lors de la synchronisation « %s » : \n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:238
+#: shell/e-shell-offline-sync.c:232
 msgid "Syncing Folder"
 msgstr "Synchronisation du Dossier"
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:316
+#: shell/e-shell-offline-sync.c:311
 #, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:333
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr "Paramètres d'Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+#, fuzzy
+msgid "Please select a user."
+msgstr "Veuillez sélectionner un serveur."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 msgid "Opening Folder"
 msgstr "Ouverture du Dossier"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:363
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Ouverture du Dossier « %s »"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:368
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, c-format
 msgid "in \"%s\" ..."
 msgstr "dans « %s » ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:450
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Impossible d'ouvrir le dossier partagé : %s."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:503
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 msgid "Cannot find the specified shared folder."
 msgstr "Impossible de trouver le dossier partagé spécifié."
 
-#: shell/e-shell-startup-wizard.c:156
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Impossible de lancer l'interface de l'assistant du lecteur \n"
-"de courriers (%s)"
-
-#: shell/e-shell-startup-wizard.c:167
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr ""
-"Impossible de lancer l'interface de l'assistant du lecteur de courriers\n"
-
-#: shell/e-shell-user-creatable-items-handler.c:581
-#: shell/e-shell-user-creatable-items-handler.c:635
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:636
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr "Nouveau"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Aucun nom de dossier spécifié."
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Le nom de dossier ne peut contenir le caractère RC"
 
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
-msgstr "Le nom du dossier ne peut contenir de slashes."
+#: shell/e-shell-utils.c:129
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Le nom de dossier ne peut contenir le caractère RC"
+
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Le nom de dossier ne peut contenir le caractère RC"
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr " « . » et  « .. » sont réservés aux noms de dossiers."
 
-#: shell/e-shell-view-menu.c:91
+#: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Les utilitaires Gnome Pilot ne semblent pas installés sur ce système."
 
-#: shell/e-shell-view-menu.c:99
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr "Erreur à l'exécution de %s"
 
 #: shell/e-shell-view-menu.c:193
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy n'a pas été trouvé dans votre $PATH."
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "Bug buddy ne peut être exécuté."
 
 #: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
@@ -25449,50 +25704,50 @@ msgstr "Créer un Nouveau Raccourci"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Sélectionnez le dossier que le raccourci doit pôinter :"
 
-#: shell/e-shell-view-menu.c:776
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "Travail _En ligne"
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr "Travail _Hors ligne"
 
-#: shell/e-shell-view-menu.c:802 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr "Travail _Hors ligne"
 
-#: shell/e-shell-view.c:236
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Aucun dossier affiché)"
 
-#: shell/e-shell-view.c:2001
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:2003
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(Aucun)"
 
-#: shell/e-shell-view.c:2050
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution est en ligne. Cliquez sur ce bouton pour travailler hors "
 "ligne."
 
-#: shell/e-shell-view.c:2057
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evloution va travailler hors ligne."
 
-#: shell/e-shell-view.c:2063
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution est hors ligne. Cliquez sur ce bouton pour travailler en "
 "ligne."
 
-#: shell/e-shell.c:174
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25503,12 +25758,12 @@ msgstr ""
 "L'erreur du système d'activation est : \n"
 "%s"
 
-#: shell/e-shell.c:754
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne peut paramétrer le stockage local -- %s"
 
-#: shell/e-shell.c:1820
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25519,19 +25774,19 @@ msgstr ""
 "terminé de manière inattendue. Vous devrez relancer Evolution pour voir\n"
 "ces données à nouveau."
 
-#: shell/e-shell.c:2085
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Arguments invalides"
 
-#: shell/e-shell.c:2087
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Impossible enregistrer dans OAF"
 
-#: shell/e-shell.c:2089
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Base de données de configuration non trouvée"
 
-#: shell/e-shell.c:2091 shell/e-storage.c:572
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Erreur générique"
 
@@ -25543,124 +25798,118 @@ msgstr "Créer un nouveau groupe de raccourcis"
 msgid "Group name:"
 msgstr "Nom du groupe :"
 
-#: shell/e-shortcuts-view.c:177
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
+#: shell/e-shortcuts-view.c:179
+#, fuzzy, c-format
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
 msgstr ""
 "Voulez-vous vraiment enlever le groupe\n"
 "« %s » de la barre de raccourcis ?"
 
-#: shell/e-shortcuts-view.c:182
-msgid "Don't remove"
-msgstr "Ne pas enlever"
-
-#: shell/e-shortcuts-view.c:212
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Renommer ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:213
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Renommer le groupe de raccourcis sélectionné par :"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "_Petites icônes"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Afficher les raccourcis sous forme de petites icônes"
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "_Grandes icônes"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Afficher les raccourcis sous forme de grandes icônes"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_Nouveau groupe..."
 
-#: shell/e-shortcuts-view.c:261
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Créer un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "_Supprimer ce groupe..."
 
-#: shell/e-shortcuts-view.c:264
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Supprimer ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "Re_nommer ce groupe..."
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Renommer ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "Masquer la barre de _raccourcis"
 
-#: shell/e-shortcuts-view.c:273
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Masquer la barre de raccourcis"
 
-#: shell/e-shortcuts-view.c:278
+#: shell/e-shortcuts-view.c:281
 msgid "Create _Default Shortcuts"
 msgstr "Créer des Raccourcis par _Défaut"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:282
 msgid "Create Default Shortcuts"
 msgstr "Créer des Raccourcis par Défaut"
 
-#: shell/e-shortcuts-view.c:398
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Renommer le raccourci"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Renommer le raccourci sélectionné par :"
 
-#: shell/e-shortcuts-view.c:412
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Ouvrir le dossier lié à ce raccourci"
 
-#: shell/e-shortcuts-view.c:414 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "_Ouvrir dans une nouvelle fenêtre"
 
-#: shell/e-shortcuts-view.c:414
+#: shell/e-shortcuts-view.c:417
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Ouvrir le dossier lié à ce raccourci dans une nouvelle fenêtre"
 
-#: shell/e-shortcuts-view.c:417
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: shell/e-shortcuts-view.c:417
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Renommer ce raccourci"
 
-#: shell/e-shortcuts-view.c:419
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "Supprimer"
 
-#: shell/e-shortcuts-view.c:419
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Supprimer ce raccourci de la barre de raccourcis"
 
-#: shell/e-shortcuts.c:643
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Erreur lors de l'enregistrement des raccourcis."
 
-#: shell/e-shortcuts.c:1100
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
@@ -25734,11 +25983,11 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fait)"
 
-#: shell/evolution-folder-selector-button.c:102
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<cliquez ici pour sélectionner un dossier>"
 
-#: shell/evolution-shell-component-utils.c:123
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -25749,7 +25998,7 @@ msgstr ""
 "\n"
 "Erreur inconnue"
 
-#: shell/evolution-shell-component-utils.c:126
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -25761,7 +26010,7 @@ msgstr ""
 "L'erreur du système de composants est :\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:133
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -25774,67 +26023,67 @@ msgstr ""
 "L'erreur du système d'activation est :\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "Erreur CORBA"
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Interrompu"
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Argument invalide"
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "A déjà un propriétaire"
 
-#: shell/evolution-shell-component.c:1165
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Pas de propriétaire"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Non trouvée"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Tyoe non-supporté"
 
-#: shell/evolution-shell-component.c:1171
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Schéma non supporté"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Opération non-supportée"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: shell/evolution-shell-component.c:1179
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:1181
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "URI invalide"
 
-#: shell/evolution-shell-component.c:1185
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "A des sous-dossiers"
 
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Pas de place restante"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "L'ancien propriétaire s'est terminé"
 
-#: shell/evolution-test-component.c:62
+#: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Type de test"
 
@@ -25844,19 +26093,11 @@ msgid "Evolution Test Component"
 msgstr "Composant Résumé d'Evolution."
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Connexions actives"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Cliquez sur «Valider» pour fermer ces connexions et travailler Hors Ligne."
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Hôte :"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr "Les connexions suivantes sont actives :"
 
@@ -25904,29 +26145,30 @@ msgstr "Nom du _Dossier : "
 msgid "_User:"
 msgstr "_Utilisateur : "
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Assistant de réglages d'Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importation des fichiers"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Fuseau horaire :"
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Bienvenue"
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
+#, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 "Bienvenue dans Evolution. Les quelques écrans suivants vous\n"
 "permettront de connecter Evolution à vos comptes de messagerie,\n"
@@ -25934,12 +26176,13 @@ msgstr ""
 "\n"
 "Veuillez cliquer sur le bouton « Suivant » pour continuer."
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
+#, fuzzy
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 "Vous avez saisi avec succès toutes les informations\n"
 "nécessaires à la configuration d'Evolution.\n"
@@ -25996,25 +26239,26 @@ msgstr "Ne plus me demander"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution ne peut importer de données depuis les fichiers suivants :"
 
-#: shell/main.c:102 shell/main.c:468
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:108
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Evolution se ferme..."
 
-#: shell/main.c:207
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:266
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -26024,48 +26268,53 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:228
+#: shell/main.c:290
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:236
+#: shell/main.c:298
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Ne plus me demander"
 
-#: shell/main.c:359
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne peut accéder au shell de Ximian Evolution."
 
-#: shell/main.c:368
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne peut initialiser le shell de Ximian Evolution : %s"
 
-#: shell/main.c:448
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Désactiver la fenêtre de démarrage"
 
-#: shell/main.c:450
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Démarrer en mode déconnecté"
 
-#: shell/main.c:452
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Démarrer en mode connecté"
 
-#: shell/main.c:454
+#: shell/main.c:535
+#, fuzzy
+msgid "Forcibly shut down all evolution components"
+msgstr "Usine pour le composant notes d'Evolution."
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr "Envoyer la sortie de déboguage de tous les composants à un fichier."
 
-#: shell/main.c:456
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:472
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26074,25 +26323,60 @@ msgstr ""
 "%s : --online et --offline ne peuvent pas être utilisés \n"
 "ensemble. Utilisez %s --help pour plus d'informations.\n"
 
-#: tools/evolution-addressbook-abuse.c:80
-#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-abuse.c:81
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Erreur de chargement du carnet d'adresses par défaut."
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Fichier d'entrée"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Fichier de sortie"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Aucun nom de fichier spécifié"
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Ajouter une pièce-jointe..."
+
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:327
+#, fuzzy
+msgid "Description of the attachment."
+msgstr "La description contient"
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:329
+#, fuzzy
+msgid "Default subject for the message."
+msgstr "Couper les messages sélectionnés"
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "Impossible de renommer « %s » : %s"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Copier le(s) contact(s) vers un autre dossier..."
@@ -26181,7 +26465,7 @@ msgstr "Voir le contact courant"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr "_Actions"
 
@@ -26299,7 +26583,7 @@ msgid "Print this item"
 msgstr "Imprimer cet élément"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:152
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -26326,7 +26610,7 @@ msgstr "Enregistrer cet élément sur le disque"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Fichier"
 
@@ -26574,7 +26858,7 @@ msgstr "List de messages par Fil de discussion"
 msgid "_Expunge"
 msgstr "_Nettoyer"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Dossier"
 
@@ -26825,7 +27109,7 @@ msgstr "Poster une Réponse"
 
 #: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Post a reply to a message message in a Public folder"
+msgid "Post a reply to a message in a Public folder"
 msgstr "Poster une réponse dans un dossier public"
 
 #: ui/evolution-mail-message.xml.h:64
@@ -26980,7 +27264,7 @@ msgstr "_Cité"
 msgid "_Resend..."
 msgstr "_Renvoyer..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Outils"
 
@@ -26995,12 +27279,12 @@ msgstr "Fermer cette fenetre"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Close"
 msgstr "_Fermer"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "Afficha_ge"
 
@@ -27179,7 +27463,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Enregistrer le fichier courant et fermer la fenêtre"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr "A_ide"
 
@@ -27356,126 +27640,116 @@ msgid "Pi_lot Settings..."
 msgstr "Paramètres du Pi_lot..."
 
 #: ui/evolution.xml.h:27
-#, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "Paramétrage du Pilot..."
-
-#: ui/evolution.xml.h:28
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr ""
 "Effacer un dossier ouvert avec « Ouvrir un Dossier d'un Autre Utilisateur »"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Env./Recevoir"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Send queued items and retrieve new items"
 msgstr "Envoyer les éléments en attente et récupèrer les nouveaux"
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "Configuration de la messagerie"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configuration de la messagerie"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Afficher les informations concernant Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Soumettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "Soumettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Soumettre un rapport d'anomalies en utilisant Bug Buddy."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Commuter"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Commuter l'affichage de la barre de dossiers"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commuter l'affichage de la barre de raccourcis"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Commuter si travail Hors ligne"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Voir le dossier sélectionné"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "FAQ Ximian Evolution"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "À _propos de Ximian Evolution..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Copier..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Barre de _dossier"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Folder..."
 msgstr "_Dossier..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "_Aller au dossier..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Déplacer..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Nouveau"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "_Nouveau dossier"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 msgid "_Remove Other User's Folder"
 msgstr "Supp_rimer un Dossier d'un Autre Utilisateur"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "Envoyer/Recevoir"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "Barre de _raccourcis"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr "_Raccourci..."
 
@@ -27551,9 +27825,8 @@ msgstr "Avec Catégorie"
 msgid "_Tasks"
 msgstr "_Tâches"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:201
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:688
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr "UTC"
 
@@ -27579,43 +27852,43 @@ msgstr ""
 "sélectionner un fuseau horaire.\n"
 "Utilisez le bouton droit de la souris pour réduire."
 
-#: widgets/menus/gal-view-menus.c:287
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "Vue _courante"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:349
+#: widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Vue personnalisée"
 
-#: widgets/menus/gal-view-menus.c:358
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr "Enregistrer la vue personnalisée"
 
-#: widgets/menus/gal-view-menus.c:371
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "Vues définies"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:423
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1069
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "Maintenant"
 
-#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: widgets/misc/e-cell-date-edit.c:802
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La date doit être dans le format : %s"
@@ -27624,92 +27897,93 @@ msgstr "La date doit être dans le format : %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "La pourcentage doit être compris entre 0 et 100 inclus"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Balte"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Europe centrale"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Chinois"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Cyrillic"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Grec"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Japonais"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Coréen"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Turc"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "Européen de l'Ouest"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Traditionnel"
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr "Simplifié"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 msgid "Visual"
 msgstr "Visuel"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Jeu de caractères inconnu : %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Saisissez le jeu de caractères à utiliser"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Autre..."
 
-#: widgets/misc/e-charset-picker.c:401
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Codage caractères"
 
-#: widgets/misc/e-clipped-label.c:110
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:187
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Éditeur de recherche"
 
-#: widgets/misc/e-filter-bar.c:209
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Enregistrer la recherche"
 
@@ -27741,1170 +28015,1575 @@ msgstr "Question"
 msgid "Message"
 msgstr "Message"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "Rechercher"
+
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr "_Trouver maintenant"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: widgets/misc/e-search-bar.c:819
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:826
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:833
+#: widgets/misc/e-search-bar.c:847
 #, fuzzy
 msgid "Text"
 msgstr "Test"
 
-#: widgets/misc/e-search-bar.c:911
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Tous"
 
-#: widgets/misc/e-search-bar.c:913
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Trouver maintenant"
 
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Usine à outils pour importer des fichiers LDIF dans Evolution"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Visualisateur de minicard du carnet d'adresses"
 
-msgid "Imports LDIF files into Evolution."
-msgstr "Importation de fichiers LDIF dans Evolution"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Composant « Résumé du calendrier » du Résumé d'Evolution"
 
-msgid "Factory to import VCard files into Evolution."
-msgstr "Fabrique pour importer des fichiers VCard dans Evolution."
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Visualisateur de minicard du carnet d'adresses"
+
+#~ msgid "1234"
+#~ msgstr "1234"
+
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "666"
+#~ msgstr "666"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<- Supp_rimer"
 
-msgid "Imports VCard files into Evolution."
-msgstr "Importation fichiers VCard dans Evolution"
+#~ msgid "<< Fewer Options"
+#~ msgstr "<< Moins d'Options"
 
-msgid "A Bonobo control for an address popup."
-msgstr "Un composant Bonobo pour des popup d'adresses."
+#~ msgid "Associated LDAP Attribute"
+#~ msgstr "Attribut LDAP Associé"
 
-msgid "A Bonobo control for displaying an address."
-msgstr "Un contrôle Bonobo pour afficher une adresse."
+#~ msgid "Attribute"
+#~ msgstr "Attribut"
 
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Un contrôle Bonobo qui affiche un carnet d'adresses."
+#~ msgid "Corresponding Evolution Attribute"
+#~ msgstr "Attribut Evolution Correspondant"
+
+#~ msgid "DN Customization"
+#~ msgstr "Personnalisation du DN"
+
+#~ msgid "Evolution Attribute"
+#~ msgstr "Attribut d'Evolution"
+
+#~ msgid "LDAP Attribute"
+#~ msgstr "Attribut LDAP"
 
 #, fuzzy
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Contrôle de configuration pour le carnet d'adresse d'Evolution."
+#~ msgid "Mappings"
+#~ msgstr "Marges"
 
-msgid "Configure access to LDAP directory servers here"
-msgstr "Configurez ici l'accès aux serveurs d'annuaires LDAP"
+#~ msgid "R_estore Defaults"
+#~ msgstr "R_estaurer les Valeurs par Défaut"
 
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Contrôle qui affiche une mini-Card du carnet d'adresses."
+#~ msgid "Re_store Defaults"
+#~ msgstr "Re_staurer les Valeurs par Défaut"
 
-msgid "Directory Servers"
-msgstr "Serveurs d'Annuaires"
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "Sélectionner tout"
 
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Visualisateur de minicard du carnet d'adresses"
+#~ msgid ""
+#~ "Selecting this option will let you change Evolution's default settings "
+#~ "for LDAP\n"
+#~ "searches, and for creating and editting contacts. "
+#~ msgstr ""
+#~ "Sélectionner cette option vous permettra de changer les paramètres "
+#~ "Evolution \n"
+#~ "par défaut pour les recherches LDAP ainsi que pour créer et éditer des "
+#~ "contacts."
+
+#~ msgid ""
+#~ "To add an attribute to the DN, select it from the list and click the "
+#~ "\"Add Attribute\" button.\n"
+#~ "Any values that you add to the DN will become required values for any new "
+#~ "contacts\n"
+#~ "that you add to the directory on the LDAP server. "
+#~ msgstr ""
+#~ "Pour ajouter un attribut au DN sélectionnez le à partir de la liste et "
+#~ "cliquez sur le bouton\n"
+#~ "« Ajouter un Attribut ». Chaque valeur que vous ajoutez au DN deviendra "
+#~ "une valeur\n"
+#~ "nécéssaire pour tout nouveau contact que vous ajouterez à l'annuaire sur "
+#~ "le serveur LDAP."
 
-msgid "Evolution component for handling contacts."
-msgstr "Composant pour le traitement des contacts."
+#~ msgid "_Add ->"
+#~ msgstr "_Ajouter ->"
 
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Utilitaire de contrôle Minicard du carnet d'adresses"
+#, fuzzy
+#~ msgid "_Add Mapping"
+#~ msgstr "Ajouter l'action"
 
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Utilitaire d'affichage des adresses du carnet"
+#~ msgid "_Add to DN"
+#~ msgstr "_Ajouter au DN"
 
-msgid "Factory for the Addressbook's address popup"
-msgstr "Usine à composants pour les popups d'adresse du carnet d'adresse"
+#~ msgid "_Always"
+#~ msgstr "_Toujours"
 
 #, fuzzy
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr ""
-"Usine pour le composant de configuration du carnet d'adresses d'Evolution."
+#~ msgid "_Delete Mapping"
+#~ msgstr "_Supprimer tout"
 
-msgid "Factory for the sample Addressbook control"
-msgstr "Usine à composants pour l'exemple de composant Carnet d'adresses"
+#~ msgid "_Distinguished Name (DN):"
+#~ msgstr "Nom _Distinctif (DN) : "
 
-msgid "Evolution's addressbook name selection interface."
-msgstr "Interface de sélection de nom du carnet d'adresses d'Evolution"
+#~ msgid "_Don't use SSL/TLS"
+#~ msgstr "Ne _pas utiliser SSL/TLS"
 
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
-"Usine à composants pour l'interface de sélection de noms du carnet "
-"d'adresses d'Evolution"
+#, fuzzy
+#~ msgid "_Edit Mapping"
+#~ msgstr "Éditer le rendez-vous"
 
-msgid "Delete Contact?"
-msgstr "Supprimer le contact ?"
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Attribut d'Evolution : "
 
-msgid "Display Cards?"
-msgstr "Afficher les cartes ?"
+#~ msgid "_If necessary "
+#~ msgstr "S_i nécéssaire"
 
-msgid "Display Cards"
-msgstr "Afficher les cartes"
+#~ msgid "_LDAP attribute:"
+#~ msgstr "Attribut _LDAP : "
 
-msgid "A Bonobo control which displays a task list."
-msgstr "Un contrôle Bonobo qui affiche une liste de tâches."
+#~ msgid "_LDAP attributes:"
+#~ msgstr "Attributs _LDAP : "
 
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Un contrôle Bonobo qui affiche un calendrier."
+#, fuzzy
+#~ msgid "_More Options >>"
+#~ msgstr "_Plus d'Options >>"
 
-msgid "Calendar and Tasks"
-msgstr "Calendrier et Tâches"
+#~ msgid "_Restore Defaults"
+#~ msgstr "_Restaurer les Valeurs par Défaut"
 
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Contrôle de configuration du calendrier d'Evolution"
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "Compte %d"
 
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Afficheur Calendrier iTip/iMip"
+#, fuzzy
+#~ msgid "account-editor"
+#~ msgstr "Éditeur de compte"
 
-msgid "Evolution component for handling the calendar."
-msgstr "Composant pour le traitement du calendrier"
+#~ msgid "Edit Contact List"
+#~ msgstr "Editer la liste de Contacts"
 
-msgid "Factory for the Evolution Tasks control"
-msgstr "Utilitaire pour le composant tâches d'Evolution."
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Liste de Contacts sans nom"
 
-msgid "Factory for the calendar iTip view control"
-msgstr "Utilitaire de contrôle de la vue iTip du Calendrier"
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d cachés)"
 
-msgid "Factory for the sample Calendar control"
-msgstr "Utilitaire de contrôle du Calendrier"
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontacts..."
 
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr ""
-"Usine à composants pour centraliser les éditeurs de composants du calendrier"
+#~ msgid "Phone Types"
+#~ msgstr "Types de téléphones"
 
-msgid "Factory to create a component editor factory"
-msgstr "Usine à composants pour créer les usines à éditeurs de composant"
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders.  You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "Evolution ne supporte pas encore la notification des rappels par courier "
+#~ "électronique. Vous ne pourrez pas éditer les options pour ce rappel."
 
-msgid "Alarm notification service"
-msgstr "Service de notification d'alarme"
+#~ msgid "st"
+#~ msgstr "er"
 
-msgid "Factory for the alarm notification service"
-msgstr "Utilitaire pour le service de notification d'alarme"
+#~ msgid "nd"
+#~ msgstr "ème"
 
-msgid "Print Calendar"
-msgstr "Imprimer le Calendrier"
+#~ msgid "rd"
+#~ msgstr "ème"
 
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Utilitaire pour importer des fichiers iCalendar dans Evolution"
+#~ msgid "th"
+#~ msgstr "ième"
 
-msgid "Imports iCalendar files into Evolution"
-msgstr "Importation fichiers iCalendar dans Evolution"
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "Ne peut initialiser GNOME"
 
-msgid "Imports vCalendar files into Evolution"
-msgstr "Importe des fichiers vCalendar dans Evolution"
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "Impossible d'activer Bonobo"
 
-msgid "Warning!"
-msgstr "Avertissement !"
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "Impossible de créer l'usine à éditeurs de composants"
 
-msgid "Add action"
-msgstr "Ajouter l'action"
+#~ msgid ""
+#~ "Could not create the tasks view.  Please check your ORBit and OAF setup."
+#~ msgstr ""
+#~ "Ne peut créer la vue des tâches. Veuillez vérifier la \n"
+#~ "configuration d'ORBit et d'OAF."
 
-msgid "Add criterion"
-msgstr "Ajouter un critère"
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolution a pris les tâches qui étaient dans votre dossier calendrier\n"
+#~ "et les a automatiquement déplacées dans le nouveau dossier de tâches."
+
+#~ msgid ""
+#~ "Evolution has tried to take the tasks that were in your calendar folder "
+#~ "and migrate them to the new tasks folder.\n"
+#~ "Some of the tasks could not be migrated, so this process may be attempted "
+#~ "again in the future."
+#~ msgstr ""
+#~ "Evolution a essayé de prendre les tâches qui étaient dans votre dossier "
+#~ "calendrier\n"
+#~ "et les a automatiquement déplacées dans le nouveau dossier de tâches.\n"
+#~ "Quelques unes n'ont pas pu être importées, ce process essaiera à nouveau."
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "Ne peut ouvrir « %s » ; aucun item du dossier calendrier n'a pu être "
+#~ "déplacé dans le dossier des tâches."
 
-msgid "Warning: Unsent Messages"
-msgstr "Avertissement : Messages Non Envoyés"
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "La méthode demandée pour charger « %s » n'est pas supportée ; aucun item "
+#~ "du dossier calendrier ne sera déplacé vers le dossier des tâches."
 
-msgid "US-Letter"
-msgstr "US-Letter"
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr ""
+#~ "Impossible d'obtenir le message : %s du dossier %s\n"
+#~ "  %s"
 
-msgid "Add Signature"
-msgstr "Ajouter une Signature"
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Ne peut créer une fenêtre de composition de message parce que vous \n"
+#~ "n'avez pas encore configuré d'identités dans le composant courrier."
 
-msgid "Execute Command..."
-msgstr "Exécuter une commande..."
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Impossible d'initialiser l'éditeur d'Evolution"
 
-msgid "Mailbox location"
-msgstr "Localisation de la boîte à lettres"
+#~ msgid "minute"
+#~ msgstr "minute"
 
-msgid "Configuration control for the Evolution Summary."
-msgstr "Contrôle de configuration du Résumé d'Evolution."
+#~ msgid "hour"
+#~ msgstr "heure"
 
-msgid "Configure the appearance of the Evolution Summary here"
-msgstr "Configurez ici l'apparence du Résumé Evolution"
+#~ msgid "week"
+#~ msgstr "semaine"
 
-msgid "Factory for Evolution Summary's configuration control."
-msgstr "Usine pour le contrôle de configuration du Résumé Evolution"
+#~ msgid "year"
+#~ msgstr "an"
+
+#, fuzzy
+#~ msgid "Rule(s)"
+#~ msgstr "Règles"
 
-msgid "Factory for the Evolution Summary component."
-msgstr "Usine pour le composant « Résumé » d'Evolution."
+#, fuzzy
+#~ msgid "Folder(s)"
+#~ msgstr "Dossiers"
 
-msgid "Summary Preferences"
-msgstr "Préférence du Résumé"
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Contrôle de configuration pour les polices d'afichage d'Evolution."
+
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Contrôle de configuration pour les comptes de courrier d'Evolution."
 
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "Le composant « Résumé » n'a pas pu initialiser Bonobo.\n"
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Contrôle de configuration pour le courrier d'Evolution."
 
-msgid "New..."
-msgstr "Nouveau..."
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Contrôle de configuration pour l'éditeur de message d'Evolution."
 
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Ne peut initialiser le composant Bonobo"
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Composant Evolution pour le traitement du courrier."
 
-msgid "The Personal Addressbook Server"
-msgstr "Le serveur de carnet d'adresses personnel"
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Usine à composants pour les dossiers de courrier."
 
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Le serveur de calendrier personnel; utilitaire de calendrier"
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Utilitaire composeur de messagerie d'Evolution."
 
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs() : Ne peut initialiser GNOME-VFS"
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "Utilitaire pour le composant de résumé de messagerie."
 
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba() : Ne peut initialiser GNOME"
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Impossible d'initialiser le composant de messagerie d'Evolution."
 
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo() : Ne peut initialiser Bonobo"
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr ""
+#~ "Ne peut initialiser le composant de configuration de messagerie "
+#~ "d'Evolution."
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr ""
+#~ "Impossible d'initialiser le composant d'information des dossiers "
+#~ "d'Evolution"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Utilitaire pour importer mbox dans Evolution."
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importe des fichiers mbox dans Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Utilitaire pour importer du courrier Outlook Express dans Evolution"
 
-msgid "_Configure..."
-msgstr "_Configurer..."
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importe des fichiers Outlook Express 4 dans Evolution"
 
-msgid "_Configure Pilot..."
-msgstr "_Configurer le Pilot..."
+#~ msgid "Really delete account?"
+#~ msgstr "Effacer réellement le compte ?"
+
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Aller au dossier suivant conntenant des messages non lus ?"
+
+#~ msgid ""
+#~ "There are no more new messages in this folder.\n"
+#~ "Would you like to go to the next folder?"
+#~ msgstr ""
+#~ "Il n'y a plus de nouveau messages dans ce dossier.\n"
+#~ "Voulez-vous aller au dossier suivant ?"
 
 #, fuzzy
-msgid "en"
-msgstr "Envoyer"
+#~ msgid ""
+#~ "Please specify signature filename\n"
+#~ "in Advanced section of signature settings."
+#~ msgstr ""
+#~ "Veuillez spécifier un fichier de signature\n"
+#~ "dans la section avancée de la configuration\n"
+#~ "des signatures."
+
+#~ msgid "Account %d"
+#~ msgstr "Compte %d"
+
+#~ msgid "Spell Checking Language"
+#~ msgstr "Langage de Correction Orthographique"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "Largeur-variable : "
+
+#~ msgid "All folders"
+#~ msgstr "Tous les dossiers"
 
 #, fuzzy
-msgid " "
-msgstr ", "
+#~ msgid "Apri file"
+#~ msgstr "Avril"
 
-msgid "Select PGP program"
-msgstr "Sélectionner un programme PGP"
+#~ msgid "Display Options"
+#~ msgstr "Options d'Affichage"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Dossiers dont les noms commencent par :"
 
 #, fuzzy
-msgid "Signature #1"
-msgstr "Signature"
+#~ msgid "Salve file"
+#~ msgstr "Sélectionner un fichier"
+
+#~ msgid "Marquette"
+#~ msgstr "Marquette"
 
 #, fuzzy
-msgid "Signature #2"
-msgstr "Signature"
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Contrôle de configuration pour les dossiers par défaut d'Evolution."
 
-msgid "_PGP binary path:"
-msgstr "Chemin binaire _PGP"
+#~ msgid "Evolution installation"
+#~ msgstr "Installation d'Evolution"
 
-msgid "Copy selected messages"
-msgstr "Copier les messages sélectionnés"
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "Cette nouvelle version d'Evolution a besoin d'installer des fichiers "
+#~ "supplémentaires dans votre répertoire personnel d'Evolution."
 
-msgid "Cut selected messages"
-msgstr "Couper les messages sélectionnés"
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "Veuillez cliquez sur « Valider » pour installer les fichiers, ou "
+#~ "« Annuler » pour quitter."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution n'a pas pu créer le répertoire\n"
+#~ "%s : \n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Directory %s\n"
+#~ "does not have the right permissions. Please make it\n"
+#~ "readable and executable and restart Evolution."
+#~ msgstr ""
+#~ "Le répertoire %s\n"
+#~ "n'a pas les permissions. Veuillez le rendre lisible\n"
+#~ "et traversable, puis relancer Evolution."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "Le fichier %s\n"
+#~ "devrait être supprimer pour permettre à Evolution de \n"
+#~ "fonctionner correctement. Veuillez le supprimer et \n"
+#~ "relancer Evolution."
+
+#~ msgid ""
+#~ "Evolution has detected an old\n"
+#~ "Executive-Summary directory.\n"
+#~ "This needs to be removed before\n"
+#~ "Evolution will run.\n"
+#~ "Do you want me to remove this directory?"
+#~ msgstr ""
+#~ "Evolution a détecté un vieux\n"
+#~ "répertoire Executive-Summary.\n"
+#~ "Il a besoin d'être effacé avant\n"
+#~ "le lancement d'Evolution.\n"
+#~ "Voulez-vous supprimer ce répertoire ?"
+
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Impossible de lancer l'interface de l'assistant du lecteur \n"
+#~ "de courriers (%s)"
+
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr ""
+#~ "Impossible de lancer l'interface de l'assistant du lecteur de courriers\n"
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Le nom du dossier ne peut contenir de slashes."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Bug buddy n'a pas été trouvé dans votre $PATH."
+
+#~ msgid "Don't remove"
+#~ msgstr "Ne pas enlever"
+
+#~ msgid "Active connections"
+#~ msgstr "Connexions actives"
+
+#~ msgid "Host"
+#~ msgstr "Hôte :"
+
+#~ msgid "Output File"
+#~ msgstr "Fichier de sortie"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "Paramétrage du Pilot..."
 
 #, fuzzy
-msgid "&lt;- _Remove"
-msgstr "<- Supprimer"
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Configuration de la messagerie"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Usine à outils pour importer des fichiers LDIF dans Evolution"
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importation de fichiers LDIF dans Evolution"
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Fabrique pour importer des fichiers VCard dans Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importation fichiers VCard dans Evolution"
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Un composant Bonobo pour des popup d'adresses."
 
-msgid "_Add -&gt;"
-msgstr "_Ajouter -&gt;"
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Un contrôle Bonobo pour afficher une adresse."
 
-msgid "Scanning for new messages"
-msgstr "Examen des nouveaux messages"
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Un contrôle Bonobo qui affiche un carnet d'adresses."
 
 #, fuzzy
-msgid "The folder %s no longer exists"
-msgstr "Le dossier n'est pas vide"
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "Contrôle de configuration pour le carnet d'adresse d'Evolution."
 
-msgid "1 byte"
-msgstr "1 octet"
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Contrôle qui affiche une mini-Card du carnet d'adresses."
 
-msgid "%u bytes"
-msgstr "%u octets"
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Composant pour le traitement des contacts."
 
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Vous avez oublié de choisir un dossier.\n"
-"Revenez en arrière et spécifiez un dossier valide pour\n"
-"y délivrer du courrier."
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "Utilitaire de contrôle Minicard du carnet d'adresses"
 
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s ne peut être reconfigurer cr il ne s'agit pas d'un dossier local."
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "Utilitaire d'affichage des adresses du carnet"
 
 #, fuzzy
-msgid "Type the name by which you would like to refer to this signature."
-msgstr ""
-"Saisissez le nom par lequel vous voulez désigner ce compte.\n"
-"Par example : « Travail » ou « Personnel »"
+#~ msgid ""
+#~ "Factory for the configuration controls for the Evolution Addressbook."
+#~ msgstr ""
+#~ "Usine pour le composant de configuration du carnet d'adresses d'Evolution."
 
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importation %s\n"
-"L'importateur n'est pas prêt.\n"
-"Attente de 5 secondes avant un nouvel essai."
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "Usine à composants pour l'exemple de composant Carnet d'adresses"
 
-msgid "Evolution Importer Assistant"
-msgstr "Assistant d'importation"
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr ""
+#~ "Usine à composants pour l'interface de sélection de noms du carnet "
+#~ "d'adresses d'Evolution"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "Supprimer le contact ?"
+
+#~ msgid "Display Cards?"
+#~ msgstr "Afficher les cartes ?"
+
+#~ msgid "Display Cards"
+#~ msgstr "Afficher les cartes"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Un contrôle Bonobo qui affiche une liste de tâches."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Un contrôle Bonobo qui affiche un calendrier."
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Contrôle de configuration du calendrier d'Evolution"
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Composant pour le traitement du calendrier"
+
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Utilitaire pour le composant tâches d'Evolution."
+
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "Utilitaire de contrôle de la vue iTip du Calendrier"
+
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "Utilitaire de contrôle du Calendrier"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr ""
+#~ "Usine à composants pour centraliser les éditeurs de composants du "
+#~ "calendrier"
+
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "Usine à composants pour créer les usines à éditeurs de composant"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Service de notification d'alarme"
+
+#~ msgid "Print Calendar"
+#~ msgstr "Imprimer le Calendrier"
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Utilitaire pour importer des fichiers iCalendar dans Evolution"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importation fichiers iCalendar dans Evolution"
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importe des fichiers vCalendar dans Evolution"
+
+#~ msgid "Warning!"
+#~ msgstr "Avertissement !"
+
+#~ msgid "Add action"
+#~ msgstr "Ajouter l'action"
+
+#~ msgid "Add criterion"
+#~ msgstr "Ajouter un critère"
+
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "Avertissement : Messages Non Envoyés"
+
+#~ msgid "US-Letter"
+#~ msgstr "US-Letter"
+
+#~ msgid "Add Signature"
+#~ msgstr "Ajouter une Signature"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Contrôle de configuration du Résumé d'Evolution."
+
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr "Usine pour le composant « Résumé » d'Evolution."
+
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Le composant « Résumé » n'a pas pu initialiser Bonobo.\n"
+
+#~ msgid "New..."
+#~ msgstr "Nouveau..."
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Ne peut initialiser le composant Bonobo"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Le serveur de carnet d'adresses personnel"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Le serveur de calendrier personnel; utilitaire de calendrier"
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs() : Ne peut initialiser GNOME-VFS"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba() : Ne peut initialiser GNOME"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
+
+#~ msgid "_Configure..."
+#~ msgstr "_Configurer..."
+
+#~ msgid "_Configure Pilot..."
+#~ msgstr "_Configurer le Pilot..."
 
 #, fuzzy
-msgid "_Preferences..."
-msgstr "Préférences du courrier"
+#~ msgid "en"
+#~ msgstr "Envoyer"
 
-msgid "Could not parse query string"
-msgstr "Ne peut analyser la chaîne de recherche"
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
 
-msgid "Email is"
-msgstr "Adresse est"
+#~ msgid "Select PGP program"
+#~ msgstr "Sélectionner un programme PGP"
 
-msgid "This page can be used to configure Calendar and Task preferences"
-msgstr ""
-"Cette page peut être utilisée pour configurer le Calendrier et les Tâches"
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Signature"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Signature"
 
-msgid "Could not create the alarm notify service"
-msgstr "Impossible de créer le service de notification d'alarme"
+#~ msgid "_PGP binary path:"
+#~ msgstr "Chemin binaire _PGP"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Copier les messages sélectionnés"
 
 #, fuzzy
-msgid "Set as default"
-msgstr "Restaurer les valeurs par défaut"
+#~ msgid "&lt;- _Remove"
+#~ msgstr "<- Supprimer"
+
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Ajouter -&gt;"
+
+#~ msgid "Scanning for new messages"
+#~ msgstr "Examen des nouveaux messages"
 
 #, fuzzy
-msgid "This Page can be used to configure the Fonts"
-msgstr "Cette page peut être utilisée pour configurer l'éditeur"
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "Le dossier n'est pas vide"
 
-msgid "This page can be used to configure E-Mail Accounts"
-msgstr ""
-"Cette page peut être utilisée pour configurer ses comptes de courrier "
-"électronique"
+#~ msgid "1 byte"
+#~ msgstr "1 octet"
 
-msgid "This page can be used to configure Mailer preferences"
-msgstr ""
-"Cette page peut être utilisée pour configurer les préférences du courrier"
+#~ msgid "%u bytes"
+#~ msgstr "%u octets"
 
-msgid "This page can be used to configure the Composer"
-msgstr "Cette page peut être utilisée pour configurer l'éditeur"
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Vous avez oublié de choisir un dossier.\n"
+#~ "Revenez en arrière et spécifiez un dossier valide pour\n"
+#~ "y délivrer du courrier."
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr ""
+#~ "%s ne peut être reconfigurer cr il ne s'agit pas d'un dossier local."
 
 #, fuzzy
-msgid "Signature hint"
-msgstr "Signature"
+#~ msgid "Type the name by which you would like to refer to this signature."
+#~ msgstr ""
+#~ "Saisissez le nom par lequel vous voulez désigner ce compte.\n"
+#~ "Par example : « Travail » ou « Personnel »"
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Importation %s\n"
+#~ "L'importateur n'est pas prêt.\n"
+#~ "Attente de 5 secondes avant un nouvel essai."
 
 #, fuzzy
-msgid "Hide signature hint"
-msgstr "Ajouter une nouvelle signature"
+#~ msgid "_Preferences..."
+#~ msgstr "Préférences du courrier"
 
-msgid "This page can be used to customize the appearance of the Summary page."
-msgstr ""
-"Cette page peut être utilisée pour personnaliser l'apparence du Résumé."
+#~ msgid "Could not parse query string"
+#~ msgstr "Ne peut analyser la chaîne de recherche"
+
+#~ msgid "Email is"
+#~ msgstr "Adresse est"
+
+#~ msgid "This page can be used to configure Calendar and Task preferences"
+#~ msgstr ""
+#~ "Cette page peut être utilisée pour configurer le Calendrier et les Tâches"
+
+#~ msgid "Could not create the alarm notify service"
+#~ msgstr "Impossible de créer le service de notification d'alarme"
 
 #, fuzzy
-msgid "This page can be used to configure various folder settings"
-msgstr "Cette page peut être utilisée pour configurer les dossiers par défaut"
+#~ msgid "Set as default"
+#~ msgstr "Restaurer les valeurs par défaut"
 
 #, fuzzy
-msgid "_Server:"
-msgstr "Nom du _serveur :"
+#~ msgid "This Page can be used to configure the Fonts"
+#~ msgstr "Cette page peut être utilisée pour configurer l'éditeur"
 
-msgid "Error in search expression."
-msgstr "Erreur dans l'expression de recherche."
+#~ msgid "This page can be used to configure E-Mail Accounts"
+#~ msgstr ""
+#~ "Cette page peut être utilisée pour configurer ses comptes de courrier "
+#~ "électronique"
 
-msgid "Restarting search."
-msgstr "Redémarrage de la recherche."
+#~ msgid "This page can be used to configure Mailer preferences"
+#~ msgstr ""
+#~ "Cette page peut être utilisée pour configurer les préférences du courrier"
 
-msgid "Meeting begins: <b>"
-msgstr "La réunion commence : <b>"
+#~ msgid "This page can be used to configure the Composer"
+#~ msgstr "Cette page peut être utilisée pour configurer l'éditeur"
 
-msgid "Task begins: <b>"
-msgstr "La tâche commence : <b>"
+#, fuzzy
+#~ msgid "Signature hint"
+#~ msgstr "Signature"
 
-msgid "Free/Busy info begins: <b>"
-msgstr "L'information Libre/Occupé commence : <b>"
+#, fuzzy
+#~ msgid "Hide signature hint"
+#~ msgstr "Ajouter une nouvelle signature"
 
-msgid "Begins: <b>"
-msgstr "Débute : <b>"
+#~ msgid ""
+#~ "This page can be used to customize the appearance of the Summary page."
+#~ msgstr ""
+#~ "Cette page peut être utilisée pour personnaliser l'apparence du Résumé."
 
-msgid "Meeting ends: <b>"
-msgstr "La réunion se termine : <b>"
+#, fuzzy
+#~ msgid "This page can be used to configure various folder settings"
+#~ msgstr ""
+#~ "Cette page peut être utilisée pour configurer les dossiers par défaut"
 
-msgid "Free/Busy info ends: <b>"
-msgstr "l'information Libre/Occupé se termine : <b>"
+#, fuzzy
+#~ msgid "_Server:"
+#~ msgstr "Nom du _serveur :"
 
-msgid "Task Completed: <b>"
-msgstr "Tâche achevée : <b>"
+#~ msgid "Error in search expression."
+#~ msgstr "Erreur dans l'expression de recherche."
 
-msgid "Task Due: <b>"
-msgstr "Tâche escomptée : <b>"
+#~ msgid "Restarting search."
+#~ msgstr "Redémarrage de la recherche."
 
-msgid "Non-Participants"
-msgstr "Non participants"
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "La réunion commence : <b>"
 
-msgid " _Refresh List "
-msgstr "_Rafraîchir la liste "
+#~ msgid "Task begins: <b>"
+#~ msgstr "La tâche commence : <b>"
 
-msgid "Show _folders from server: "
-msgstr "Afficher les _dossiers du serveur :"
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "L'information Libre/Occupé commence : <b>"
 
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution ne peut pas accéder au stockage local du carnet d'adresses.\n"
-"Ceci peut être du à un plantage du composant evolution-addressbook.\n"
-"Pour nous aider à comprendre et corriger ce problème, veuillez envoyer\n"
-"un courrier à Jon Trowbridge <trow@ximian.com> avec une déscritpion "
-"détaillée\n"
-"des circonstances sous lesquelles cette erreur est survenue. \n"
-"Merci."
+#~ msgid "Begins: <b>"
+#~ msgstr "Débute : <b>"
 
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution ne peut pas accéder au stockage local du carnet\n"
-"d'adresses. Cela ne devrait jamais arriver en temps normal.\n"
-"Vous devrez peut-être redémarrer Evolution pour résoudre ce\n"
-"problème."
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "La réunion se termine : <b>"
 
-msgid "_Browse..."
-msgstr "_Parcourir..."
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "l'information Libre/Occupé se termine : <b>"
 
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "L'état de la réunion a changé. Envoyer une version corrigée ?"
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Tâche achevée : <b>"
 
-msgid "_Delete this Appointment"
-msgstr "_Supprimer ce rendez-vous"
+#~ msgid "Task Due: <b>"
+#~ msgstr "Tâche escomptée : <b>"
 
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
-msgstr ""
-"Émetteur : %s\n"
-"Sujet : %s"
+#~ msgid "Non-Participants"
+#~ msgstr "Non participants"
 
-msgid "SASL Protocol error"
-msgstr "Erreur de protocole SASL"
+#~ msgid " _Refresh List "
+#~ msgstr "_Rafraîchir la liste "
 
-msgid "I/O Error: %s"
-msgstr "Erreur d'E/S : %s"
+#~ msgid "Show _folders from server: "
+#~ msgstr "Afficher les _dossiers du serveur :"
 
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Erreur du message de bienvenue : %s : sûrement pas grave"
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution ne peut pas accéder au stockage local du carnet d'adresses.\n"
+#~ "Ceci peut être du à un plantage du composant evolution-addressbook.\n"
+#~ "Pour nous aider à comprendre et corriger ce problème, veuillez envoyer\n"
+#~ "un courrier à Jon Trowbridge <trow@ximian.com> avec une déscritpion "
+#~ "détaillée\n"
+#~ "des circonstances sous lesquelles cette erreur est survenue. \n"
+#~ "Merci."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution ne peut pas accéder au stockage local du carnet\n"
+#~ "d'adresses. Cela ne devrait jamais arriver en temps normal.\n"
+#~ "Vous devrez peut-être redémarrer Evolution pour résoudre ce\n"
+#~ "problème."
 
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Demande HELO dépassée : %s non fatal"
+#~ msgid "_Browse..."
+#~ msgstr "_Parcourir..."
 
-msgid "HELO response error: %s: non-fatal"
-msgstr "Erreur réponse HELO : %s non fatal"
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "L'état de la réunion a changé. Envoyer une version corrigée ?"
 
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Réponse QUIT dépassée : %s / non fatal"
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Supprimer ce rendez-vous"
 
-msgid "Insert File"
-msgstr "Insérer un fichier"
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Émetteur : %s\n"
+#~ "Sujet : %s"
 
-msgid "You have chosen an invalid date."
-msgstr "Vous avez choisi une date invalide."
+#~ msgid "SASL Protocol error"
+#~ msgstr "Erreur de protocole SASL"
 
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"La date du message sera comparée quelle que soit l'heure où\n"
-"le filtre est lancé ou le dossier virtuel ouvert."
+#~ msgid "I/O Error: %s"
+#~ msgstr "Erreur d'E/S : %s"
 
-msgid "Command"
-msgstr "Commande"
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Erreur du message de bienvenue : %s : sûrement pas grave"
 
-msgid "Evolution News Editor"
-msgstr "Editeur de News d'Evolution"
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Demande HELO dépassée : %s non fatal"
 
-msgid "Are you sure you want to delete this news account?"
-msgstr "Êtes-vous sûr de vouloir supprimer ce compte de nouvelles ?"
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "Erreur réponse HELO : %s non fatal"
 
-msgid "You must configure an account before you can send this email."
-msgstr "Vous devez configurer un compte avant de pouvoir envoyer ce message."
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Réponse QUIT dépassée : %s / non fatal"
 
-msgid "NNTP Server:"
-msgstr "Serveur NNTP :"
+#~ msgid "Insert File"
+#~ msgstr "Insérer un fichier"
 
-msgid "News Servers"
-msgstr "Serveurs de nouvelles"
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Vous avez choisi une date invalide."
 
-msgid "Source"
-msgstr "Source"
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "La date du message sera comparée quelle que soit l'heure où\n"
+#~ "le filtre est lancé ou le dossier virtuel ouvert."
 
-msgid "Source Information"
-msgstr "Informations de source"
+#~ msgid "Command"
+#~ msgstr "Commande"
 
-msgid "newswindow1"
-msgstr "newswindow1"
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Êtes-vous sûr de vouloir supprimer ce compte de nouvelles ?"
 
-msgid "Save to Disk..."
-msgstr "Enregistrer sur le disque..."
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr ""
+#~ "Vous devez configurer un compte avant de pouvoir envoyer ce message."
 
-msgid "View messages..."
-msgstr "Voir les messages..."
+#~ msgid "NNTP Server:"
+#~ msgstr "Serveur NNTP :"
 
-msgid "Executing shell command: %s"
-msgstr "Exécution de la commande : %s"
+#~ msgid "News Servers"
+#~ msgstr "Serveurs de nouvelles"
 
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Créez un nouveau dossier"
+#~ msgid "Source Information"
+#~ msgstr "Informations de source"
 
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Le type du dossier sélectionné n'est pas valide pour\n"
-"l'opération demandée."
+#~ msgid "newswindow1"
+#~ msgstr "newswindow1"
 
-msgid "You may only import to local folders"
-msgstr "Vous ne pouvez importer que vers des dossiers locaux"
+#~ msgid "Save to Disk..."
+#~ msgstr "Enregistrer sur le disque..."
 
-msgid "_Contact List"
-msgstr "Liste de Contacts"
+#~ msgid "View messages..."
+#~ msgstr "Voir les messages..."
 
-msgid "Inline Text _File..."
-msgstr "Insérer un _fichier texte..."
+#~ msgid "Executing shell command: %s"
+#~ msgstr "Exécution de la commande : %s"
 
-msgid "Insert a file as text into the message"
-msgstr "Insère un fichier comme texte dans le message"
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Créez un nouveau dossier"
 
-msgid "Insert text file..."
-msgstr "Insérer un fichier texte..."
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Le type du dossier sélectionné n'est pas valide pour\n"
+#~ "l'opération demandée."
 
-msgid "Send _Later"
-msgstr "Envoyer plus _tard"
+#~ msgid "You may only import to local folders"
+#~ msgstr "Vous ne pouvez importer que vers des dossiers locaux"
 
-msgid "Send _later"
-msgstr "Envoyer plus _tard"
+#~ msgid "_Contact List"
+#~ msgstr "Liste de Contacts"
 
-msgid "Send the message later"
-msgstr "Envoyer le message plus tard"
+#~ msgid "Inline Text _File..."
+#~ msgstr "Insérer un _fichier texte..."
 
-msgid "_Pilot Settings..."
-msgstr "Paramétrage du Pilot..."
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Insère un fichier comme texte dans le message"
 
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "Sources du carnet d'adresses"
+#~ msgid "Insert text file..."
+#~ msgstr "Insérer un fichier texte..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Envoyer plus _tard"
 
-msgid "Configuration control for the Evolution Addressbook."
-msgstr "Contrôle de configuration pour le carnet d'adresse d'Evolution."
+#~ msgid "Send _later"
+#~ msgstr "Envoyer plus _tard"
+
+#~ msgid "Send the message later"
+#~ msgstr "Envoyer le message plus tard"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "Paramétrage du Pilot..."
 
 #, fuzzy
-msgid "This page can be used to configure Addressbook Settings"
-msgstr "Cette page peut être utilisée pour configurer l'éditeur"
+#~ msgid "Addressbook Settings"
+#~ msgstr "Sources du carnet d'adresses"
 
-msgid "Evolution calendar executive summary component."
-msgstr "Composant « Résumé du calendrier » du Résumé d'Evolution"
+#~ msgid "Configuration control for the Evolution Addressbook."
+#~ msgstr "Contrôle de configuration pour le carnet d'adresse d'Evolution."
 
-msgid "Factory for the Calendar Summary component."
-msgstr "Utilitaire pour le composant Résumé Calendrier."
+#, fuzzy
+#~ msgid "This page can be used to configure Addressbook Settings"
+#~ msgstr "Cette page peut être utilisée pour configurer l'éditeur"
 
-msgid "Sta_rt of day:"
-msgstr "_Début de la journée :"
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Utilitaire pour le composant Résumé Calendrier."
 
-msgid "_End of day:"
-msgstr "_Fin de la journée :"
+#~ msgid "Sta_rt of day:"
+#~ msgstr "_Début de la journée :"
 
-msgid "_Other Organizer"
-msgstr "_Autre organizer"
+#~ msgid "_End of day:"
+#~ msgstr "_Fin de la journée :"
 
-msgid "Clearsigning is not supported by this cipher"
-msgstr "La signature en clair n'est pas supportée par ce message chiffré"
+#~ msgid "_Other Organizer"
+#~ msgstr "_Autre organizer"
 
-msgid "Please enter your %s passphrase for %s"
-msgstr "Veuillez saisir votre phrase de passe %s pour %s"
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "La signature en clair n'est pas supportée par ce message chiffré"
 
-msgid "Please enter your %s passphrase"
-msgstr "Veuillez saisir votre phrase de passe pour %s"
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Veuillez saisir votre phrase de passe %s pour %s"
 
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Impossible de signer ce message : pas de partie plaintext à signer"
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Veuillez saisir votre phrase de passe pour %s"
 
-msgid "Cannot sign this message: no password provided"
-msgstr "Impossible de signer ce message : pas de mot de passe fourni"
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Impossible de signer ce message : pas de partie plaintext à signer"
 
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Impossible de signer ce message : ne peut créer le tube vers GPG/PGP : %s"
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Impossible de signer ce message : pas de mot de passe fourni"
 
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Impossible de signer ce message : pas de partie plaintext à signer"
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Impossible de signer ce message : ne peut créer le tube vers GPG/PGP : %s"
 
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Impossible de vérifier ce message : pas de partie plaintext à vérifier"
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Impossible de signer ce message : pas de partie plaintext à signer"
 
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Impossible de vérifier ce message : ne peut pas créer le tube vers GPG/PGP : "
-"%s"
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr ""
+#~ "Impossible de vérifier ce message : pas de partie plaintext à vérifier"
 
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Impossible de crypter ce message : pas de partie plaintext à crypter"
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Impossible de vérifier ce message : ne peut pas créer le tube vers GPG/"
+#~ "PGP : %s"
 
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Impossible de crypter ce message : pas de mot de passe fourni"
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr ""
+#~ "Impossible de crypter ce message : pas de partie plaintext à crypter"
 
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Impossible de crypter ce message : ne peut créer le tube vers GPG/PGP : %s"
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Impossible de crypter ce message : pas de mot de passe fourni"
 
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-"Impossible de décrypter ce message : pas de partie cyphertext à décrypter"
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Impossible de crypter ce message : ne peut créer le tube vers GPG/PGP : %s"
 
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Impossible de décrypter ce message : pas de mot de passe spécifié"
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "Impossible de décrypter ce message : pas de partie cyphertext à décrypter"
 
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Impossible de décrypter ce message : ne peut créer le tube vers GPG/PGP : %s"
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Impossible de décrypter ce message : pas de mot de passe spécifié"
 
-msgid "%s server %s"
-msgstr "%s serveur %s"
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Impossible de décrypter ce message : ne peut créer le tube vers GPG/PGP : "
+#~ "%s"
 
-msgid "(unknown host)"
-msgstr "(Hôte inconnu)"
+#~ msgid "%s server %s"
+#~ msgstr "%s serveur %s"
 
-msgid "Directory tree of mbox files"
-msgstr "Arborescence de répertoires des fichiers mbox"
+#~ msgid "(unknown host)"
+#~ msgstr "(Hôte inconnu)"
 
-msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
-"Pour accéder à du courrier stocké dans une arborescence de \n"
-"fichiers mbox externe. Cela vous permets d'accéder directement \n"
-"à des fichiers Pine ou elm.\n"
-"NOTE : Ce fournisseur est expérimental, donc assurez vous de \n"
-"sauvegarder tous les courriers de ces répertoires avant tout."
+#~ msgid "Directory tree of mbox files"
+#~ msgstr "Arborescence de répertoires des fichiers mbox"
 
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Impossible d'ajouter le message au fichier mbox : %s : %s"
+#~ msgid ""
+#~ "For accessing mail storedin an external tree of mbox files.\n"
+#~ "This will allow you to directly access pine and elm folders.\n"
+#~ "NOTE: This provider is still experimental so ensure you backup any mail "
+#~ "folders first."
+#~ msgstr ""
+#~ "Pour accéder à du courrier stocké dans une arborescence de \n"
+#~ "fichiers mbox externe. Cela vous permets d'accéder directement \n"
+#~ "à des fichiers Pine ou elm.\n"
+#~ "NOTE : Ce fournisseur est expérimental, donc assurez vous de \n"
+#~ "sauvegarder tous les courriers de ces répertoires avant tout."
 
-msgid "Could not file: %s: %s"
-msgstr "Impossible d'ouvrir le fichier : %s : %s"
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Impossible d'ajouter le message au fichier mbox : %s : %s"
 
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Stockage « %s » n'existe pas ou n'est pas un répertoire."
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Impossible d'ouvrir le fichier : %s : %s"
 
-msgid "Mail tree %s"
-msgstr "Arbre de courrier %s"
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Stockage « %s » n'existe pas ou n'est pas un répertoire."
 
-msgid "Random"
-msgstr "Aléatoirement"
+#~ msgid "Mail tree %s"
+#~ msgstr "Arbre de courrier %s"
 
-msgid "Cannot execute signature script"
-msgstr "Impossible d'exécuter le script de signature"
+#~ msgid "Random"
+#~ msgstr "Aléatoirement"
+
+#~ msgid "Cannot execute signature script"
+#~ msgstr "Impossible d'exécuter le script de signature"
 
 #, fuzzy
-msgid " Edit "
-msgstr "_Éditer"
+#~ msgid " Edit "
+#~ msgstr "_Éditer"
 
-msgid "Advanced Options"
-msgstr "Options avancées"
+#~ msgid "Advanced Options"
+#~ msgstr "Options avancées"
 
 #, fuzzy
-msgid "E_nable advanced options"
-msgstr "Activer les options avancées"
+#~ msgid "E_nable advanced options"
+#~ msgstr "Activer les options avancées"
 
-msgid "Randomized"
-msgstr "Aléatoire"
+#~ msgid "Randomized"
+#~ msgstr "Aléatoire"
 
-msgid "Same as text"
-msgstr "Même chose en texte"
+#~ msgid "Same as text"
+#~ msgstr "Même chose en texte"
 
-msgid "Select a signature script"
-msgstr "Sélectionnez un script de signature"
+#~ msgid "Select a signature script"
+#~ msgstr "Sélectionnez un script de signature"
 
-msgid "Use _HTML for this signature"
-msgstr "Utiliser _HTML pour cette signature"
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "Utiliser _HTML pour cette signature"
 
-msgid "_Enable spell checking"
-msgstr "_Activer la correction orthographique"
+#~ msgid "_Enable spell checking"
+#~ msgstr "_Activer la correction orthographique"
 
-msgid "_HTML Signature:"
-msgstr "Signature _HTML :"
+#~ msgid "_HTML Signature:"
+#~ msgstr "Signature _HTML :"
 
-msgid "_Random"
-msgstr "_Aléatoire"
+#~ msgid "_Random"
+#~ msgstr "_Aléatoire"
 
-msgid "Could not create a PGP encryption context."
-msgstr "Ne peut créer un contexte de codage PGP."
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Ne peut créer un contexte de codage PGP."
 
-msgid "Could not create a PGP decryption context."
-msgstr "Ne peut créer un contexte de décodage PGP."
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Ne peut créer un contexte de décodage PGP."
 
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution ne reconnait pas ce type de message signé numériquement."
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "Evolution ne reconnait pas ce type de message signé numériquement."
 
-msgid "Signature name:"
-msgstr "Nom de signature : "
+#~ msgid "Signature name:"
+#~ msgstr "Nom de signature : "
 
-msgid "Riga"
-msgstr "Riga"
+#~ msgid "Riga"
+#~ msgstr "Riga"
 
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Êtes-vous sûr de vouloir supprimer le dossier « %s » ?"
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Êtes-vous sûr de vouloir supprimer le dossier « %s » ?"
 
-msgid "_Advanced Search..."
-msgstr "Recherche _avancée..."
+#~ msgid "_Advanced Search..."
+#~ msgstr "Recherche _avancée..."
 
 #, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Informations de trace opaque invalides :\n"
-"%s"
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "Informations de trace opaque invalides :\n"
+#~ "%s"
 
-msgid "No such message: %s"
-msgstr "Aucun message correspondant : %s"
+#~ msgid "No such message: %s"
+#~ msgstr "Aucun message correspondant : %s"
 
-msgid "You cannot copy messages from this trash folder."
-msgstr "Vous ne pouvez copier des messages de ce dossier corbeille"
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Vous ne pouvez copier des messages de ce dossier corbeille"
 
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"Impossible de récupérer la boîte de réception pour le nouveau stockage de "
-"courrier :\n"
-"%s\n"
-"Aucun racourci ne sera créé."
+#~ msgid ""
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
+#~ msgstr ""
+#~ "Impossible de récupérer la boîte de réception pour le nouveau stockage de "
+#~ "courrier :\n"
+#~ "%s\n"
+#~ "Aucun racourci ne sera créé."
 
-msgid "Afrikaans"
-msgstr "Afrikaans"
+#~ msgid "Afrikaans"
+#~ msgstr "Afrikaans"
 
-msgid "Arabic"
-msgstr "Arabe"
+#~ msgid "Arabic"
+#~ msgstr "Arabe"
 
-msgid "Dari"
-msgstr "Dari"
+#~ msgid "Dari"
+#~ msgstr "Dari"
 
-msgid "Hulu"
-msgstr "Hulu"
+#~ msgid "Hulu"
+#~ msgstr "Hulu"
 
 #, fuzzy
-msgid "_Language:"
-msgstr "Langue : "
+#~ msgid "_Language:"
+#~ msgstr "Langue : "
 
-msgid "Moving"
-msgstr "Déplacement"
+#~ msgid "Moving"
+#~ msgstr "Déplacement"
 
-msgid "Copying"
-msgstr "Duplication"
+#~ msgid "Copying"
+#~ msgstr "Duplication"
 
-msgid "Edit Addressbook"
-msgstr "Éditer le carnet d'adresses"
-
-msgid "A_uthenticate with server using:"
-msgstr "S'_identifier sur le serveur en utilisant : "
-
-msgid "Add Addressbook"
-msgstr "Ajouter un carnet d'adresses"
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "S'_identifier sur le serveur en utilisant : "
 
-msgid "Advanced"
-msgstr "Avancée"
+#~ msgid "Add Addressbook"
+#~ msgstr "Ajouter un carnet d'adresses"
 
-msgid "Base"
-msgstr "Base"
+#~ msgid "Advanced"
+#~ msgstr "Avancée"
 
-msgid "Check this if the server requires you to authenticate."
-msgstr "Cochez ici si le serveur nécessite une identification."
-
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
-msgstr ""
-"Evolution utilisera le Nom Distinctif (DN) pour vous authentifier sur le "
-"serveur"
+#~ msgid "Base"
+#~ msgstr "Base"
 
-msgid "The information below is required in order to add an addressbook.  "
-msgstr ""
-"Les renseignements ci-dessous sont demandés pour ajouter un carnet d'adresses"
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Cochez ici si le serveur nécessite une identification."
 
-msgid "This information is not required for most ldap servers. "
-msgstr "Ces renseignements ne sont demandés par la plupart des serveurs LDAP."
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with "
+#~ "the server"
+#~ msgstr ""
+#~ "Evolution utilisera le Nom Distinctif (DN) pour vous authentifier sur le "
+#~ "serveur"
 
-msgid ""
-"This information is used by your ldap server to specify which nodes are used "
-"in a search. Contact your server administrator for more information."
-msgstr ""
-"Ces renseignements sont utilisés par votre serveur KDAP pour préciser les "
-"noeuds utilisés dans une recherche. Contactez votre administrateur de "
-"serveur pour plus de renseignements."
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr ""
+#~ "Les renseignements ci-dessous sont demandés pour ajouter un carnet "
+#~ "d'adresses"
 
-msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
-msgstr ""
-"Noeud de base pour toutes vos recherches sur le serveur LDAP. Contactez "
-"votre administrateur de serveur pour plus d'informations."
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr ""
+#~ "Ces renseignements ne sont demandés par la plupart des serveurs LDAP."
 
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Nom du serveur où votre carnet d'adresses est situé."
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "Ces renseignements sont utilisés par votre serveur KDAP pour préciser les "
+#~ "noeuds utilisés dans une recherche. Contactez votre administrateur de "
+#~ "serveur pour plus de renseignements."
 
-msgid "This is the port that your ldap server uses."
-msgstr "C'est le port que votre serveur LDAP utilise."
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
+#~ msgstr ""
+#~ "Noeud de base pour toutes vos recherches sur le serveur LDAP. Contactez "
+#~ "votre administrateur de serveur pour plus d'informations."
 
-msgid "_Account name:"
-msgstr "Nom du _Compte"
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Nom du serveur où votre carnet d'adresses est situé."
 
-msgid "C_ontaining:"
-msgstr "C_ontenant :"
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "C'est le port que votre serveur LDAP utilise."
 
-msgid "Show contacts matching the following criteria:"
-msgstr "Afficher les contacts satisfaisant aux critères suivants :"
+#~ msgid "_Account name:"
+#~ msgstr "Nom du _Compte"
 
-msgid "Create new appointments with a default _reminder"
-msgstr "Créer un nouveau rendez-vous avec un _rappel par défaut"
+#~ msgid "C_ontaining:"
+#~ msgstr "C_ontenant :"
 
-msgid "First day of wee_k:"
-msgstr "_Premier jour de la semaine :"
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Afficher les contacts satisfaisant aux critères suivants :"
 
-msgid "_Other"
-msgstr "_Autre"
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Créer un nouveau rendez-vous avec un _rappel par défaut"
 
-msgid "%s: Inbox"
-msgstr "%s : Boîte de réception"
+#~ msgid "First day of wee_k:"
+#~ msgstr "_Premier jour de la semaine :"
 
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "Toujours crypter pour moi lors de l'envoi de courrier crypté"
+#~ msgid "_Other"
+#~ msgstr "_Autre"
 
-msgid "E_mail address:"
-msgstr "_Adresse électronique :"
+#~ msgid "%s: Inbox"
+#~ msgstr "%s : Boîte de réception"
 
-msgid "Ed_it..."
-msgstr "Éd_iter..."
+#~ msgid "Always _encrypt to myself when sending encrypted mail"
+#~ msgstr "Toujours crypter pour moi lors de l'envoi de courrier crypté"
 
-msgid "Edi_t..."
-msgstr "Édi_ter..."
+#~ msgid "E_mail address:"
+#~ msgstr "_Adresse électronique :"
 
-msgid "Forwards and Replies"
-msgstr "Transferts et réponses"
+#~ msgid "Ed_it..."
+#~ msgstr "Éd_iter..."
 
-msgid "Keyboard Shortcuts"
-msgstr "Raccourcis claviers"
+#~ msgid "Edi_t..."
+#~ msgstr "Édi_ter..."
 
-msgid "Misspelled color: "
-msgstr "Couleur de correction : "
+#~ msgid "Forwards and Replies"
+#~ msgstr "Transferts et réponses"
 
-msgid "N_ew..."
-msgstr "_Nouveau..."
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Raccourcis claviers"
 
-msgid "Ne_w..."
-msgstr "Nou_veau..."
+#~ msgid "Misspelled color: "
+#~ msgstr "Couleur de correction : "
 
-msgid "Shortcut"
-msgstr "Raccourci"
+#~ msgid "N_ew..."
+#~ msgstr "_Nouveau..."
 
-msgid "Signatures"
-msgstr "Signatures"
+#~ msgid "Ne_w..."
+#~ msgstr "Nou_veau..."
 
-msgid "_Organization:"
-msgstr "_Organisation :"
+#~ msgid "Shortcut"
+#~ msgstr "Raccourci"
 
-msgid "_Reply-To:"
-msgstr "_Répondre-À :"
+#~ msgid "_Organization:"
+#~ msgstr "_Organisation :"
 
-msgid "_Send messages in HTML format by default"
-msgstr "_Envoyer par défaut le courrier au format HTML"
+#~ msgid "_Reply-To:"
+#~ msgstr "_Répondre-À :"
 
-msgid "_Server type: "
-msgstr "Type de _serveur : "
+#~ msgid "_Send messages in HTML format by default"
+#~ msgstr "_Envoyer par défaut le courrier au format HTML"
 
-msgid "Baltic (IS0-8859-13)"
-msgstr "Baltique (IS0-8859-13)"
+#~ msgid "_Server type: "
+#~ msgstr "Type de _serveur : "
 
-msgid "                        "
-msgstr "                        "
+#~ msgid "Baltic (IS0-8859-13)"
+#~ msgstr "Baltique (IS0-8859-13)"
 
-msgid " color"
-msgstr "Couleur"
+#~ msgid "                        "
+#~ msgstr "                        "
 
-msgid "&lt;&lt; S_imple"
-msgstr "&lt;&lt; S_imple"
+#~ msgid " color"
+#~ msgstr "Couleur"
 
-msgid "/home/rodo/cvs/evolution/mail/"
-msgstr "/home/rodo/cvs/evolution/mail/"
+#~ msgid "&lt;&lt; S_imple"
+#~ msgstr "&lt;&lt; S_imple"
 
-msgid "Ad_vanced &gt;&gt;"
-msgstr "A_vancée &gt;&gt;"
+#~ msgid "/home/rodo/cvs/evolution/mail/"
+#~ msgstr "/home/rodo/cvs/evolution/mail/"
 
-msgid "Composer"
-msgstr "Composeur"
+#~ msgid "Ad_vanced &gt;&gt;"
+#~ msgstr "A_vancée &gt;&gt;"
 
-msgid "Confirm when Expunging a folder"
-msgstr "Confirmer avant le nettoyage du dossier"
+#~ msgid "Composer"
+#~ msgstr "Composeur"
 
-msgid "Default Forward style is: "
-msgstr "Le style du transfert par défaut est : "
+#~ msgid "Confirm when Expunging a folder"
+#~ msgstr "Confirmer avant le nettoyage du dossier"
 
-msgid "Default character encoding: "
-msgstr "Codage caractère par défaut"
+#~ msgid "Default Forward style is: "
+#~ msgstr "Le style du transfert par défaut est : "
 
-msgid "Delete selected signature"
-msgstr "Effacer les signatures sélectionnées"
+#~ msgid "Default character encoding: "
+#~ msgstr "Codage caractère par défaut"
 
-msgid "Display"
-msgstr "Affichage"
+#~ msgid "Delete selected signature"
+#~ msgstr "Effacer les signatures sélectionnées"
 
-msgid "Edit signature content in editor"
-msgstr "Éditer le contenu de la signature dans l'éditeur"
+#~ msgid "Display"
+#~ msgstr "Affichage"
 
-msgid "File containing signature"
-msgstr "Fichier contenant la signature"
+#~ msgid "Edit signature content in editor"
+#~ msgstr "Éditer le contenu de la signature dans l'éditeur"
 
-msgid "Hide advanced settings"
-msgstr "Cacher les règlages avancés"
+#~ msgid "File containing signature"
+#~ msgstr "Fichier contenant la signature"
 
-msgid "If selected signature will be included in random signature list"
-msgstr ""
-"Si sélectionné : la signature sera inclue dans la liste de signatures "
-"alléatoires"
+#~ msgid "Hide advanced settings"
+#~ msgstr "Cacher les règlages avancés"
 
-msgid "In HTML mail"
-msgstr "Entrée courrier HTML"
+#~ msgid "If selected signature will be included in random signature list"
+#~ msgstr ""
+#~ "Si sélectionné : la signature sera inclue dans la liste de signatures "
+#~ "alléatoires"
 
-msgid "Include in _random signatures list"
-msgstr "Inclure dans la liste des signatures aléatoires"
+#~ msgid "In HTML mail"
+#~ msgstr "Entrée courrier HTML"
 
-msgid "List of signatures"
-msgstr "Liste de signatures"
+#~ msgid "Include in _random signatures list"
+#~ msgstr "Inclure dans la liste des signatures aléatoires"
 
-msgid "Name of selected signature"
-msgstr "Nom de la signature sélectionnée"
+#~ msgid "List of signatures"
+#~ msgstr "Liste de signatures"
 
-msgid "News"
-msgstr "Nouvelles"
+#~ msgid "Name of selected signature"
+#~ msgstr "Nom de la signature sélectionnée"
 
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Avertissement lors de l'envoi d'un message sans _sujet"
+#~ msgid "News"
+#~ msgstr "Nouvelles"
 
-msgid "Script which is run before signature loading from specified filename"
-msgstr "Script lancé avant le chargement de la signature du fichier spécifié"
+#~ msgid "Prompt when sending messages with an _empty subject"
+#~ msgstr "Avertissement lors de l'envoi d'un message sans _sujet"
 
-msgid "Select Filter Log file..."
-msgstr "Sélectionnez le fichier de journal pour les filtres..."
+#~ msgid "Script which is run before signature loading from specified filename"
+#~ msgstr ""
+#~ "Script lancé avant le chargement de la signature du fichier spécifié"
 
-msgid "Select PGP binary"
-msgstr "Sélectionner un binaire PGP"
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Sélectionnez le fichier de journal pour les filtres..."
 
-msgid "Show advanced settings"
-msgstr "Afficher les préférences avancées"
+#~ msgid "Select PGP binary"
+#~ msgstr "Sélectionner un binaire PGP"
 
-msgid "Sources"
-msgstr "Sources"
+#~ msgid "Show advanced settings"
+#~ msgstr "Afficher les préférences avancées"
 
-msgid "_Edit..."
-msgstr "É_diter..."
+#~ msgid "Sources"
+#~ msgstr "Sources"
 
-msgid "_Filename"
-msgstr "Nom du _fichier"
+#~ msgid "_Edit..."
+#~ msgstr "É_diter..."
 
-msgid "_Highlight citations with"
-msgstr "Mettre les citations en _surbrillance"
+#~ msgid "_Filename"
+#~ msgstr "Nom du _fichier"
 
-msgid "_Log filter actions to:"
-msgstr "Enregistrer les actions des _filtres dans :"
+#~ msgid "_Highlight citations with"
+#~ msgstr "Mettre les citations en _surbrillance"
 
-msgid "_Mark messages as Read after"
-msgstr "_Marquer les messages comme lus après"
+#~ msgid "_Log filter actions to:"
+#~ msgstr "Enregistrer les actions des _filtres dans :"
 
-msgid "_Name"
-msgstr "_Nom"
+#~ msgid "_Mark messages as Read after"
+#~ msgstr "_Marquer les messages comme lus après"
 
-msgid "_Send mail in HTML format by default."
-msgstr "Envoyer par défaut le courrier au format HTML"
+#~ msgid "_Name"
+#~ msgstr "_Nom"
 
-msgid "placeholder"
-msgstr "bouche-trou"
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Envoyer par défaut le courrier au format HTML"
 
-msgid "seconds."
-msgstr "secondes."
+#~ msgid "placeholder"
+#~ msgstr "bouche-trou"
 
-msgid "Evolution component for the executive summary."
-msgstr "Composant pour le résumé"
+#~ msgid "seconds."
+#~ msgstr "secondes."
 
-msgid "Factory for the Evolution executive summary component."
-msgstr "Usine pour le composant « Résumé » d'Evolution."
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "Composant pour le résumé"
 
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Ne peut initialiser le composant « Résumé » d'Evolution."
+#~ msgid "Factory for the Evolution executive summary component."
+#~ msgstr "Usine pour le composant « Résumé » d'Evolution."
 
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Vous pouvez sélectionner une page HTML différente pour l'arrière-plan du "
-"Résumé.\n"
-"\n"
-"Ne rien préciser pour la page par défaut."
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Ne peut initialiser le composant « Résumé » d'Evolution."
 
-msgid "Open %s with the default GNOME application"
-msgstr "Ouvrir %s avec l'application GNOME par défaut"
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "Vous pouvez sélectionner une page HTML différente pour l'arrière-plan du "
+#~ "Résumé.\n"
+#~ "\n"
+#~ "Ne rien préciser pour la page par défaut."
 
-msgid "Open %s with the default GNOME web browser"
-msgstr "Ouvrir %s avec le navigateur GNOME par défaut"
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Ouvrir %s avec l'application GNOME par défaut"
 
-msgid "Send an email to %s"
-msgstr "Envoyer un courrier à %s"
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Ouvrir %s avec le navigateur GNOME par défaut"
 
-msgid "Run %s"
-msgstr "Lancer %s"
+#~ msgid "Send an email to %s"
+#~ msgstr "Envoyer un courrier à %s"
 
-msgid "Close %s"
-msgstr "Fermer %s"
+#~ msgid "Run %s"
+#~ msgstr "Lancer %s"
 
-msgid "Move %s to the left"
-msgstr "Déplacer %s vers la gauche"
+#~ msgid "Close %s"
+#~ msgstr "Fermer %s"
 
-msgid "Move %s to the right"
-msgstr "Déplacer %s vers la droite"
+#~ msgid "Move %s to the left"
+#~ msgstr "Déplacer %s vers la gauche"
 
-msgid "Move %s into the previous row"
-msgstr "Déplacer %s à la rangée précédente"
+#~ msgid "Move %s to the right"
+#~ msgstr "Déplacer %s vers la droite"
 
-msgid "Move %s into the next row"
-msgstr "Déplacer %s à la ligne suivante"
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Déplacer %s à la rangée précédente"
 
-msgid "Configure %s"
-msgstr "Configure /%s"
+#~ msgid "Move %s into the next row"
+#~ msgstr "Déplacer %s à la ligne suivante"
 
-msgid "page"
-msgstr "page"
+#~ msgid "Configure %s"
+#~ msgstr "Configure /%s"
 
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Ne peut ouvrir le fichier HTML :\n"
-"%s"
+#~ msgid "page"
+#~ msgstr "page"
 
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Erreur de lecture des données :\n"
-"%s"
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne peut ouvrir le fichier HTML :\n"
+#~ "%s"
 
-msgid "File does not have a place for the services.\n"
-msgstr "Le fichier ne possède pas d'emplacement pour les services.\n"
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erreur de lecture des données :\n"
+#~ "%s"
 
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Le composant « Résumé » n'a pas pu initialiser Bonobo.\n"
-"Si vous recevez un message d'avertissement traitant de RootPOA, cela \n"
-"signifie certainement que vous avez lier Bonobo à GOAD au lieu de OAF."
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Le fichier ne possède pas d'emplacement pour les services.\n"
 
-msgid "Factory for the RDF summary."
-msgstr "Usine à composants pour résumé RDF."
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "Le composant « Résumé » n'a pas pu initialiser Bonobo.\n"
+#~ "Si vous recevez un message d'avertissement traitant de RootPOA, cela \n"
+#~ "signifie certainement que vous avez lier Bonobo à GOAD au lieu de OAF."
 
-msgid "RDF Summary"
-msgstr "Résumé RDF"
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Usine à composants pour résumé RDF."
 
-msgid "Factory for the test bonobo component."
-msgstr "Usine pour le composant de test Bonobo"
+#~ msgid "RDF Summary"
+#~ msgstr "Résumé RDF"
 
-msgid "Factory for the test component."
-msgstr "Usine pour le composant de test"
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Usine pour le composant de test Bonobo"
 
-msgid "Test bonobo service"
-msgstr "Service Bonobo de test"
+#~ msgid "Factory for the test component."
+#~ msgstr "Usine pour le composant de test"
 
-msgid "Test service"
-msgstr "Service de test"
+#~ msgid "Test bonobo service"
+#~ msgstr "Service Bonobo de test"
 
-msgid "Update automatically"
-msgstr "Mettre à jour automatiquement"
+#~ msgid "Test service"
+#~ msgstr "Service de test"
 
-msgid "Update now"
-msgstr "Mettre à jour maintenant"
+#~ msgid "Update automatically"
+#~ msgstr "Mettre à jour automatiquement"
 
-msgid "Update every "
-msgstr "Mettre à jour tout les "
+#~ msgid "Update now"
+#~ msgstr "Mettre à jour maintenant"
 
-msgid "Incomplete message written on pipe!"
-msgstr "Message incomplet écrit dans le conduit !"
+#~ msgid "Update every "
+#~ msgstr "Mettre à jour tout les "
 
-msgid "Mail Summary"
-msgstr "Résumé des courrier"
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Message incomplet écrit dans le conduit !"
 
-msgid "Factory for the Evolution notes component."
-msgstr "Usine pour le composant notes d'Evolution."
+#~ msgid "Mail Summary"
+#~ msgstr "Résumé des courrier"
 
-msgid "Factory for the Notes control"
-msgstr "Usine pour le contrôle Notes"
+#~ msgid "Factory for the Notes control"
+#~ msgstr "Usine pour le contrôle Notes"
 
-msgid "Error hashing password."
-msgstr "Erreur lors du hachage du mot de passe."
+#~ msgid "Error hashing password."
+#~ msgstr "Erreur lors du hachage du mot de passe."
 
-msgid "Invalid password."
-msgstr "Mot de passe invalide."
+#~ msgid "Invalid password."
+#~ msgstr "Mot de passe invalide."
 
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Impossible de signer : certificat non trouvé pour « %s »."
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Impossible de signer : certificat non trouvé pour « %s »."
 
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Impossible de signer (ClearSign) : cerificat non trouvé pour « %s »."
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr ""
+#~ "Impossible de signer (ClearSign) : cerificat non trouvé pour « %s »."
 
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr ""
-"Impossible de crypter : Erreur lors de la création de l'information "
-"enveloppée."
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ msgstr ""
+#~ "Impossible de crypter : Erreur lors de la création de l'information "
+#~ "enveloppée."
 
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "Echec du cryptage. Impossible de créer un contecte de cryptage."
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "Echec du cryptage. Impossible de créer un contecte de cryptage."
 
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr ""
-"Impossible de crypter les données : clé d'utilisateur invlaide : « %s »."
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr ""
+#~ "Impossible de crypter les données : clé d'utilisateur invlaide : « %s »."
 
-msgid "Could not encrypt: encoding failed."
-msgstr "Échec de l'encryptage : l'encodage a échoué."
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "Échec de l'encryptage : l'encodage a échoué."
 
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Veuillez saisir le mot de passe NNTP pour %s@%s"
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Veuillez saisir le mot de passe NNTP pour %s@%s"
 
-msgid "Server rejected username"
-msgstr "Le serveur a rejeté le nom d'utilisateur"
+#~ msgid "Server rejected username"
+#~ msgstr "Le serveur a rejeté le nom d'utilisateur"
 
-msgid "Server rejected username/password"
-msgstr "Le serveur a rejeté le nom d'utilisateur/mot de passe"
+#~ msgid "Server rejected username/password"
+#~ msgstr "Le serveur a rejeté le nom d'utilisateur/mot de passe"
 
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Erreur interne : format d'uid invalide : %s"
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "Erreur interne : format d'uid invalide : %s"
 
-msgid "Could not get group list from server."
-msgstr "Ne peut obtenir la liste des grouges du serveur."
+#~ msgid "Could not get group list from server."
+#~ msgstr "Ne peut obtenir la liste des grouges du serveur."
 
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Impossible de charger la liste des groupes du serveur pour %s : %s"
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Impossible de charger la liste des groupes du serveur pour %s : %s"
 
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-"Impossible d'enregistrer le fichier de la liste des groupes pour %s : %s"
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr ""
+#~ "Impossible d'enregistrer le fichier de la liste des groupes pour %s : %s"
 
-msgid "Enter folder URI"
-msgstr "Saisissez l'URI du dossier"
+#~ msgid "Enter folder URI"
+#~ msgstr "Saisissez l'URI du dossier"
 
-msgid "Dump"
-msgstr "Afficher"
+#~ msgid "Dump"
+#~ msgstr "Afficher"
 
 #~ msgid "Confirm Overwrite"
 #~ msgstr "Confirmez l'Écrasement"
-
-#~ msgid "Configure your timezone, Calendar and Task List here "
-#~ msgstr ""
-#~ "Configurez ici votre fuseau horaire, votre Calendrier et votre Liste de "
-#~ "Tâches"
diff --git a/po/ga.po b/po/ga.po
index 49d1f16c43..7538712271 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: locales 0.01\n"
-"POT-Creation-Date: 2002-10-28 16:49-0500\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2002-01-25 14:00-0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -13,41 +13,53 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Eagarth�ir Nuachr�in Evolution"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-msgid "Imports LDIF files into Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution "
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution "
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "S�bh�il Mar"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ainm"
 
 # ta
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Rpost"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Tosa�ocht"
 
@@ -57,16 +69,17 @@ msgstr "Tos."
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Gn�"
 
@@ -76,12 +89,12 @@ msgid "Bus"
 msgstr "GN"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Teoranta"
 
@@ -92,12 +105,13 @@ msgstr "Teor."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Baile"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Eagr�"
@@ -108,18 +122,18 @@ msgstr "Eag."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "G�than P�ca"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "Car"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Facs Ghn�"
@@ -129,13 +143,13 @@ msgid "Bus Fax"
 msgstr "Facs Ghn�"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Facs Bhaile"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Gn� 2"
 
@@ -144,43 +158,43 @@ msgid "Bus 2"
 msgstr "Gn� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Baile 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Eile"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Facs Eile"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Raidio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
@@ -191,15 +205,15 @@ msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Rphost 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Rphost 3"
@@ -223,6 +237,7 @@ msgid "Dep"
 msgstr "Ran."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Oifig"
@@ -232,6 +247,7 @@ msgid "Off"
 msgstr "Oif."
 
 #: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Teideal"
@@ -246,6 +262,7 @@ msgid "Prof"
 msgstr "Dea."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Bainisteoir"
@@ -259,6 +276,7 @@ msgid "Ass"
 msgstr "Cnt."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Leasainm"
@@ -268,16 +286,19 @@ msgid "Nick"
 msgstr "L.ainm."
 
 #: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1418
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "C�ile"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1459
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Nota"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "Feilire URI"
 
@@ -295,307 +316,395 @@ msgid "FBUrl"
 msgstr "FBUrl"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "Default server calendar"
+msgstr "S�bh�il Feilire"
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "Feilire"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Data Breithe"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Ainm Chlainn"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "Car"
+
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-card-simple.c:893
 #: addressbook/backend/ebook/e-destination.c:706
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Liost Tadhall"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
+#: addressbook/backend/ebook/e-card.c:1308
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Ainm Fhada"
+
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Seoladh:"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "Carta� Sheoladh"
+
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "Cr�ochnaithe"
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "Data Breithe"
+
+#: addressbook/backend/ebook/e-card.c:1355
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1369
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Eagr�"
+
+#: addressbook/backend/ebook/e-card.c:1390
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard do %s"
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+#, fuzzy
+msgid "Mailer"
+msgstr "Post"
+
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "Freagrair"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Feilire"
+
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Dealaigh Tadhall?"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-#: addressbook/backend/ebook/load-pine-addressbook.c:22
-#: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
-#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/e-card.c:1480
+#, fuzzy
+msgid "Category List"
+msgstr "_Saghas:"
+
+#: addressbook/backend/ebook/e-card.c:1487
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1494
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1501
+#, fuzzy
+msgid "List"
+msgstr "l�osta"
+
+#: addressbook/backend/ebook/e-card.c:1508
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Seoladh Eile"
+
+#: addressbook/backend/ebook/e-card.c:1515
+#, fuzzy
+msgid "Arbitrary"
+msgstr "Tosa�ocht"
+
+#: addressbook/backend/ebook/e-card.c:1522
+#, fuzzy
+msgid "ID"
+msgstr "I"
+
+#: addressbook/backend/ebook/e-card.c:1529
+#, fuzzy
+msgid "Last Use"
+msgstr "Greamaigh"
+
+# Avoid; either use KR or KP
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "Sc�r"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:2978
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Ag Cuardaigh..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Ag L��d��il..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+msgid "Using Distinguished Name (DN)"
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "Seoladh Rpost:"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Cumraigh do %s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1572
-#: addressbook/backend/pas/pas-backend-ldap.c:1575
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 #, fuzzy
 msgid "Default Sync Address:"
 msgstr "Seoladh Rpost:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Configure access to LDAP directory servers here"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Eagar Leabhar Sheoladh"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Alairm Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:611
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1067
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
 msgstr "Tadhalla�"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "Freastala� LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public Contacts"
 msgstr "Tadhalla�"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Tadhall"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Scr�os an sceal seo"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "L��osta Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "Liost Tadhall"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Scr�os an sceal seo"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:648
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1193
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1630
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 #, fuzzy
 msgid "Account Name"
 msgstr "Ainm _Chuntas:"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Ainm do Fhreastala�"
 
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
-msgid "Could not initialize gnome-vfs"
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Tadhalla� Eile"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:480
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -603,54 +712,57 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:537
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
 "is unreachable."
 msgstr ""
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:582
+#: addressbook/gui/component/addressbook.c:557
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Te�p ag fork: %s"
 
-#: addressbook/gui/component/addressbook.c:633
-#: addressbook/gui/component/addressbook.c:636
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Pasfhocal do %s, le do thoil (�s�ideoir %s)"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 #, fuzzy
 msgid "Email begins with"
 msgstr "Rphost 2"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:956
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -658,7 +770,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:962
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -666,25 +778,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:968
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:975
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1050
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -693,116 +805,110 @@ msgstr ""
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr "(gan ainm)"
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/component/e-address-popup.c:478
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "1234"
-msgstr "123"
+#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
+msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:5
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-#, fuzzy
-msgid "380"
-msgstr "389"
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "636"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "666"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "<- _Remove"
-msgstr "_Scr�os"
+msgid "Add LDAP Server"
+msgstr "Freastala� LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Roghanna"
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr ""
 
@@ -811,26 +917,18 @@ msgstr ""
 # ## 	The 'msgid' names and spellings for languages are those listed
 # ##     in iso-639.def from glibc
 # aa 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always"
 msgstr "Af�iris"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Anonymously"
 msgstr "Gan anim"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -839,79 +937,60 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Connecting"
 msgstr "_Tadhall"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
-msgid "DN Customization"
-msgstr "Gan Eolas"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "_Dealaigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
-msgid "Email Address:"
-msgstr "_Seoladh RPost:"
+msgid "Edit LDAP Server"
+msgstr "Freastala� LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
-msgid "Evolution Attribute"
-msgstr "Alairm Evolution"
+msgid "Email Address:"
+msgstr "_Seoladh RPost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Finished"
 msgstr "Cuardaigh:"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "Gn�th"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "LDAP Configuration Assistant"
 msgstr "Socr�"
 
-# CH
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Mappings"
-msgstr "An tS�n"
-
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_gach"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -921,73 +1000,34 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:42
-msgid "Objectclasses Used in Evolution:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses Used on Server:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Aon"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-#, fuzzy
-msgid "R_estore Defaults"
-msgstr "Gn�th"
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-#, fuzzy
-msgid "Re_store Defaults"
-msgstr "Gn�th"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr ""
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
-#: calendar/gui/e-week-view.c:1240
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 msgid "Searching"
 msgstr "Cuardaigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
-msgid "Select"
-msgstr "T�g Gach Rud"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Scr�oste"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -998,7 +1038,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1007,53 +1047,46 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Eolas"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Cumraigh do %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1061,7 +1094,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1070,7 +1103,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1078,17 +1111,17 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
 "directory tree. A search scope of \"sub\" will include all entries below "
 "your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1098,34 +1131,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1133,91 +1166,46 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "Using email address"
 msgstr "Seoladh Rpost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:108
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Suimigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-#, fuzzy
-msgid "_Add ->"
-msgstr "_Suimigh"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Add Mapping"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-msgid "_Add to DN"
-msgstr ""
-
-# ##
-# ## Languages (ISO 639 code in brackets)
-# ## 	The 'msgid' names and spellings for languages are those listed
-# ##     in iso-639.def from glibc
-# aa 
-#: addressbook/gui/component/ldap-config.glade.h:112
-#, fuzzy
-msgid "_Always"
-msgstr "Af�iris"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "_Dealaigh gach rud"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Taispea�n"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Distinguished Name (DN):"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_Don't use SSL/TLS"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1227,210 +1215,153 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Eagar"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "Eagar coinne"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-#, fuzzy
-msgid "_Evolution attribute:"
-msgstr "Alairm Evolution"
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_If necessary "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "_LDAP attributes:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-#, fuzzy
-msgid "_More Options >>"
-msgstr "_Roghanna"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Poirt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
-#, fuzzy
-msgid "_Restore Defaults"
-msgstr "Gn�th"
-
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Search base:"
 msgstr "C_uardaigh..."
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "Ainm _Freastala�:"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:131
-#, fuzzy
-msgid "account-druid"
-msgstr "Cuntas %d"
-
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "account-editor"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "cards"
 msgstr "Gan carta�"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Cumraigh do %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:136
-msgid "edit_server_window_simple"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:97
 #, fuzzy
 msgid "general-tab"
 msgstr "Gn�th"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:139
-msgid "objectclasses-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "searching-tab"
 msgstr "Cuardaigh"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Scr�os Gach Rud"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:699
-#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
-#: shell/e-shortcuts-view.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Scr�os"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr "Scr�os Gach Rud"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
-msgid "Send HTML Mail?"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
-msgstr ""
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "L��osta Tadhall Nua"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
-msgid "Unnamed Contact List"
-msgstr ""
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "Tadhall Nua"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
+msgid "Send HTML Mail?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
+# Avoid; either use KR or KP
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+#, fuzzy
+msgid "Source"
+msgstr "Sc�r"
+
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "T�g Tadhalla� o Leabhar Seoladh"
 
-#: addressbook/gui/component/select-names/e-select-names.c:564
+#: addressbook/gui/component/select-names/e-select-names.c:648
 msgid "Find contact in"
 msgstr ""
 
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Find"
+msgstr "Cuardaigh:"
+
 # FIXME SP?
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "T�g Ainmh�:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 #, fuzzy
 msgid "Selected Contacts:"
 msgstr "Dealaigh Tadhall?"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 #, fuzzy
 msgid "Show Contacts"
 msgstr "Tadhalla�"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid ""
 "Type a name into the entry, or\n"
 "select one from the list below:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
 msgstr "_Saghas:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "_Filltea�n:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "A_ssistant's name:"
 msgstr "Ainm Ch�nt�ir:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 #, fuzzy
 msgid "Add_ress..."
 msgstr "S_eoladh..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
 msgid "Birthda_y:"
 msgstr "_Breithl�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#, fuzzy
-msgid "C_ontacts..."
-msgstr "_Tadhalla�..."
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr ""
@@ -1441,7 +1372,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr ""
 
@@ -1451,7 +1382,7 @@ msgid "D_epartment:"
 msgstr "_Rang:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "Sonra�"
 
@@ -1492,62 +1423,72 @@ msgstr "_Eagr�:"
 msgid "P_rofession:"
 msgstr "_Dearbh�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Cin�al  F�in"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "S_pouse:"
 msgstr "_C�ile:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "This is the _mailing address"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
-#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
-#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "_Dealaigh"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "Tideal _Post:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "Ainm _Bainisteoir:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "_Leasainm:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Oifig:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "Seoladh leathanach greas�n:"
 
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:183
+#, fuzzy
+msgid "Editable"
+msgstr "Chumasach"
+
 # US
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "St�it Aontaithe Mheirice�"
 
@@ -1555,1438 +1496,1473 @@ msgstr "St�it Aontaithe Mheirice�"
 # ## Countries (Listed in ISO 3166-1)
 # ##
 # AF
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr "An afganast�in"
 
 # AL
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "An Alb�in"
 
 # DZ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "An Ailg�ir"
 
 # AS
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr ""
 
 # AD
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr ""
 
 # AO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr ""
 
 # AI
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr ""
 
 # AQ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Antarctica"
 msgstr "an tAntartasch"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr ""
 
 # AR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr ""
 
 # AM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr ""
 
 # AR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr ""
 
 # AU
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "An Astr�il"
 
 # AT
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "An Ostair"
 
 # AZ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr ""
 
 # BS
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr ""
 
 # BS
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr ""
 
 # FIXME
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr "An Bhanglaid�is"
 
 # BB
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr ""
 
 # BY
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr ""
 
 # BE
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "An Bheilg"
 
 # BZ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr ""
 
 # BJ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr ""
 
 # BM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr ""
 
 # BT
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr ""
 
 # BO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "An Bholaiv"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr ""
 
 # BW
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr ""
 
 # BV
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr ""
 
 # BR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "An Bhrasa�l"
 
 # IO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
 msgstr ""
 
 # BN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr ""
 
 # BG
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "An Bhulg�ir"
 
 # BF
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Burkina Faso"
 msgstr ""
 
 # BI
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr ""
 
 # KH
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr ""
 
 # CM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr "Camar�n"
 
 # CA
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Ceanada"
 
 # CV
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr ""
 
 # KY
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr ""
 
 # CF
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
 msgstr ""
 
 # TD
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr ""
 
 # CL
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "An tSile"
 
 # CH
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "An tS�n"
 
 # CX
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr ""
 
 # CC
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr ""
 
 # CO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "An Chol�im"
 
 # KM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr ""
 
 # CG
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "An Cong�"
 
 # CK
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr ""
 
 # CR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "C�sta Rice"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr ""
 
 # HR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr ""
 
 # CU
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "C�ba"
 
 # CY
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "An Chipir"
 
 # CZ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr ""
 
 # DK
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "An Danmhairg"
 
 # DJ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr ""
 
 # DM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr ""
 
 # DO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr ""
 
 # ET
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr ""
 
 # EC
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Eacuad�r"
 
 # EG
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "An �igipt"
 
 # SV
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "An tSalvad�ir"
 
 # GQ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr ""
 
 # ER
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr ""
 
 # EE
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr ""
 
 # ET
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "An Aet�ip"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr ""
 
 # FO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr ""
 
 # FJ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr ""
 
 # FI
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "An Fhionlainn"
 
 # FR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "An Fhrainc"
 
 # fr 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Fraincis"
 
 # PF
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr ""
 
 # TF
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr ""
 
 # GA
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr ""
 
 # GM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr ""
 
 # GE
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr ""
 
 # DE
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "An Ghearm�in"
 
 # GH
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "G�na"
 
 # GI
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr ""
 
 # GR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "An Ghr�ig"
 
 # GL
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "An Ghraonlainn"
 
 # GD
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr ""
 
 # GP
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr ""
 
 # GU
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr ""
 
 # GT
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatamala"
 
 # GN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr "An Ghuine"
 
 # GN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr ""
 
 # GY
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "An Ghu�in"
 
 # HT
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "H��t�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr ""
 
 # HN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr ""
 
 # HK
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr ""
 
 # HU
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "An Ung�ir"
 
 # IS
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "An �oslainn"
 
 # IN 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "An India"
 
 # ID
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "An Indin�is"
 
 # EI
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "�ire"
 
 # IL
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Iosrael"
 
 # IT
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "An Iod�il"
 
 # JM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Iam�ice"
 
 # JP
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "An tSeap�in"
 
 # JO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "An Iord�in"
 
 # kk 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr ""
 
 # KE
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "An Ch�inia"
 
 # KI
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Republic Of"
 msgstr ""
 
 # KW
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Cu�it"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr ""
 
 # LA
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr ""
 
 # LV
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr ""
 
 # LB
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "An Liob�in"
 
 # LS
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr ""
 
 # LR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr ""
 
 # LI
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr ""
 
 # LT
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr ""
 
 # LU
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Lucsamburg"
 
 # MO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Macau"
 msgstr ""
 
 # MK
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr ""
 
 # MG
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr "Madagascar"
 
 # MW
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr "Malawi"
 
 # MY
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr "An Mhalaeisia"
 
 # mt
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr ""
 
 # ML
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr "Mali"
 
 # MT
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "M�lta"
 
 # MH
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr ""
 
 # MQ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr ""
 
 # MR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr ""
 
 # mr
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 #, fuzzy
 msgid "Mauritius"
 msgstr "Marata�"
 
 # YT
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr ""
 
 # MX
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr "Meicsiceo"
 
 # ID
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Moldova, Republic Of"
 msgstr ""
 
 # MC
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
 msgstr "Monac�"
 
 # MN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr "An Mh�ng�il"
 
 # MS
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr ""
 
 # MA
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr "Marac�"
 
 # FIXME
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr "M�saimbic"
 
 # MM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr ""
 
 # NA
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr ""
 
 # na 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr "N�r�is"
 
 # NP
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr "Neipe�l"
 
 # NL
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr "An Isiltir"
 
 # AN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr ""
 
 # NC
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr ""
 
 # NZ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr "An Nua-Sh�alainn"
 
 # NI 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
 # NE
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr "An N�gir"
 
 # NG
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr "An Nig�ir"
 
 # NU
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr ""
 
 # NF
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr ""
 
 # MP
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr ""
 
 # NO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr "An Iorua"
 
 # OM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr ""
 
 # PK
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
 msgid "Pakistan"
 msgstr "An Phacast�in"
 
 # PW
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr "An Phalaist�n"
 
 # PA
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
 msgid "Panama"
 msgstr ""
 
 # PG
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr ""
 
 # PY
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr "Paraguay"
 
 # PE
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
 msgid "Peru"
 msgstr "Peiri�"
 
 # PH FIXME
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr "Na hOile�in"
 
 # PI
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr ""
 
 # PL
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr "An Pholainn"
 
 # PT
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr "An Phortaing�il"
 
 # PR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr ""
 
 # QA
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr ""
 
 # RE
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr ""
 
 # RO 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr "An R�m�in"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr ""
 
 # RW
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr ""
 
 # LC
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Vincent And The Grena-dines"
 msgstr ""
 
 # WS
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Samoa"
 msgstr ""
 
 # SM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "San Marino"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
 msgstr ""
 
 # SA
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr "An Araib"
 
 # SN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr ""
 
 # SC
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr ""
 
 # SL
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr ""
 
 # SG
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr "Singeap�r"
 
 # SK
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr ""
 
 # SI
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr ""
 
 # SB
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr ""
 
 # SO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr ""
 
 # ZA 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 # ES
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr "An Sp�inn"
 
 # LK
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr "Sr� Lanca"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
 # SD
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr "An tS�d�in"
 
 # SR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
 msgid "Suriname"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
 # SZ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr ""
 
 # SE
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr "An tSualainn"
 
 # CH
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr "An Eilv�is"
 
 # TW
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr ""
 
 # TJ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Tanzania, United Republic Of"
 msgstr ""
 
 # TH
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "An T�alainn"
 
 # TG
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr ""
 
 # TK
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr ""
 
 # TO
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tonga"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr ""
 
 # TN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "An T�in�is"
 
 # TR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr "An Tuirc"
 
 # TM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr ""
 
 # TV
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr ""
 
 # UG
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr "Uganda"
 
 # UA
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr ""
 
 # AR
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
 msgstr "Aontas na n�im�r�ochta� Arabacha"
 
 # UK
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr "An R�ocht"
 
 # UM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
 # UY
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr "Uragua"
 
 # UZ
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr ""
 
 # VU
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr ""
 
 # VE
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr "Veinis�ala"
 
 # VN
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr "Vitneam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Virgin Islands, British"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Virgin Islands, U.S."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr ""
 
 # EH
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr ""
 
 # YE
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr "�imin"
 
 # YU
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr "An I�glaiv"
 
 # ZM
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr "An tSaimbia"
 
 # ZW
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zimbabwe"
 msgstr "An tSiomb�ib"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:459
+#, fuzzy
+msgid "Book"
+msgstr "Cr�ochnaithe"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
+#, fuzzy
+msgid "Card"
+msgstr "Car"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+#, fuzzy
+msgid "Is New Card"
+msgstr "_Nua"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "Dealaigh Tadhall?"
+# FR
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "An Fhrainc"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:833
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "S�bh�il mar VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2440
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Eagar Ainm Fhada"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Ainm Fhada"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "R-phost"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr ""
+"Earraidh ag s�bhh�il sc�ala� do: %s\n"
+" %s"
+
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr "carta.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "l�osta"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:221
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/file-exists.glade.h:1
-msgid "Confirm Overwrite"
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:2
-msgid "Don't bother translating this string.  It's not used."
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 msgid "Overwrite"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Seoladh _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_T�r:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Seoladh:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "_Cathair:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "Bosca _Phoist:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "C�d _ZIP:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "Esq."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Cead:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Deireadh:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_M�an:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Tid�al:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "List _name:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Members"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Scr�os"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "contact-list-editor"
 msgstr ""
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "L�osta Nua"
+
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "S�bh�il mar VCard"
@@ -3037,277 +3013,299 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:153
+#. FIXME: get the toplevel window...
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Cuardaigh"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 card"
 
 # FIXME : Grammar ? 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d carta�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:408
+# DE
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:466
+#, fuzzy
+msgid "Query"
+msgstr "An Ghearm�in"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 msgid "Error getting book view"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#, fuzzy
+msgid "Model"
+msgstr "G�than P�ca"
+
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
-#: addressbook/gui/widgets/e-addressbook-util.c:91
-#: addressbook/gui/widgets/e-minicard.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1141
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr "iEarraidh gan Aithne"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1171
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
-#: camel/camel-service.c:739 camel/camel-service.c:779
-#: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:779
+#: camel/camel-service.c:849 camel/camel-service.c:892
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr "Ceangailte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "�dar�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Required"
 msgstr "�dar�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "Leabhar Seoladh:"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Earraidh Eile"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:63
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#, fuzzy
+msgid "_Discard"
+msgstr "Priont�il carta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
-#: addressbook/gui/widgets/e-addressbook-util.c:292
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
-#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1588
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-#, fuzzy
-msgid "Display Cards?"
-msgstr "Taispea�n"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-#, fuzzy
-msgid "Display Cards"
-msgstr "Taispea�n"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:213
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 #, fuzzy
 msgid "Move card to"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 #, fuzzy
 msgid "Copy card to"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 #, fuzzy
 msgid "Move cards to"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard do %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Saghas"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Leabhar Seoladh:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
-#: addressbook/gui/widgets/e-addressbook-view.c:813
-#: addressbook/gui/widgets/e-addressbook-view.c:1790
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "S�bh�il mar VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "New Contact..."
 msgstr "Tadhall Nua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 #, fuzzy
 msgid "New Contact List..."
 msgstr "L��osta Tadhall Nua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_C�ip do Fillte�n..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 #, fuzzy
 msgid "Import..."
 msgstr "Chl�_fhoireann..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Post sce�l do Tadhall..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Albachta� Phoist"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:814
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr ""
 
 # fa 
-#: addressbook/gui/widgets/e-addressbook-view.c:816
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Priont�il"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_C�ip do Fillte�n..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 #, fuzzy
 msgid "Move to folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:826
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Gearr"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:827
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "C�ip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:828
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Greamaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Dealaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 #, fuzzy
 msgid "Current View"
 msgstr "Radharc Carta"
@@ -3316,7 +3314,7 @@ msgstr "Radharc Carta"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,ij,k,l,m,Mc,o,p,qr,s,t,u,v,w,xyz"
 
@@ -3324,11 +3322,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,ij,k,l,m,Mc,o,p,qr,s,t,u,v,w,xyz"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,Mc,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1290
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3396,20 +3394,62 @@ msgstr "F�n Eile"
 msgid "Primary Phone"
 msgstr "F�n Th�saiocht"
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr "agus %d carta� eile."
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "agus aon card eile."
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+#, fuzzy
+msgid "Width"
+msgstr "Leitheid:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "Airde:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr ""
+
+# FI
+#: addressbook/gui/widgets/e-minicard-label.c:136
+#, fuzzy
+msgid "Field"
+msgstr "An Fhionlainn"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "Ainm Chlainn"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr ""
+
+# CO
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#, fuzzy
+msgid "Column Width"
+msgstr "An Chol�im"
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -3418,28 +3458,47 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:452
+#, fuzzy
+msgid "Adapter"
+msgstr "Bainisteoir"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Scr�oste"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr ""
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Radharc Carta"
 
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#, fuzzy
+msgid "GTK Tree View"
+msgstr "Radharc Seachtain"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Priont�il Carta�"
 
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
 msgid "Print card"
 msgstr "Priont�il carta"
 
@@ -3512,7 +3571,6 @@ msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr ""
 
@@ -3532,17 +3590,16 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Roghanna"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Treoshu�omh"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Leathanach"
 
@@ -3558,9 +3615,7 @@ msgstr "P�ip�ir"
 msgid "Paper source:"
 msgstr ""
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Portr�id"
 
@@ -3620,43 +3675,167 @@ msgstr "Chl�_fhoireann..."
 msgid "Untitled appointment"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr ""
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr ""
+
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "Ard"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1721
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "Gn�th"
 
-#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "Bun"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3665,83 +3844,72 @@ msgstr ""
 msgid "Default Priority:"
 msgstr "Tosa�ocht"
 
-#: calendar/conduits/todo/todo-conduit.c:951
 #: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #, fuzzy
 msgid "Calendar and Tasks"
 msgstr "Teachtaireacht Feilire"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Teachtaireacht Feilire"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Evolution Tasks control"
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Alairm Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution - Cruthaigh fillte�n nua"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "Factory to create a component editor factory"
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Eagarth�ir Nuachr�in Evolution"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Eagarth�ir Nuachr�in Evolution"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Starting:"
 msgstr "�lbachta�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 #, fuzzy
 msgid "Ending:"
 msgstr "Rabhadh"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr "am neamhbhail�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution "
@@ -3751,7 +3919,7 @@ msgstr "Evolution "
 # ## 	The 'msgid' names and spellings for languages are those listed
 # ##     in iso-639.def from glibc
 # aa 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alairm on %s"
@@ -3773,11 +3941,17 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "Eagar coinne"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:741
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
+msgid "Warning"
+msgstr "Rabhadh"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:849
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3785,13 +3959,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Rabhadh"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:764
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3802,15 +3970,15 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:778
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "T�ip ag tosnaithe GNOME"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3826,36 +3994,36 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "aa %d %b"
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:409 calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:416
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:440 calendar/gui/calendar-commands.c:442
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3864,412 +4032,324 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:397
-msgid "Private"
-msgstr "Priobhdach"
-
-#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:398
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:542
-msgid "N"
-msgstr "T"
-
-#: calendar/gui/calendar-model.c:542
-msgid "S"
-msgstr "D"
-
-#: calendar/gui/calendar-model.c:544
-msgid "E"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:544
-msgid "W"
-msgstr "I"
-
-#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
-#: calendar/gui/e-calendar-table.c:470
-msgid "Free"
-msgstr "Saor"
-
-#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1165
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
-msgid "Not Started"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
-msgid "In Progress"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
-msgid "Completed"
-msgstr "Cr�ochnaithe"
-
-#: calendar/gui/calendar-model.c:1055
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
-#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
-#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
-msgid "None"
-msgstr "Ar Bith"
-
-#: calendar/gui/calendar-model.c:1723
-msgid "Recurring"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1725
-msgid "Assigned"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
-#: calendar/gui/e-meeting-model.c:862
-msgid "Yes"
-msgstr "T�"
-
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:863
-msgid "No"
-msgstr "N�l"
-
-#: calendar/gui/calendar-view-factory.c:148
-msgid "Day View"
-msgstr "Radharc L�"
-
-#: calendar/gui/calendar-view-factory.c:151
-msgid "Work Week View"
-msgstr ""
-
-#: calendar/gui/calendar-view-factory.c:154
-msgid "Week View"
-msgstr "Radharc Seachtain"
-
-#: calendar/gui/calendar-view-factory.c:157
-msgid "Month View"
-msgstr "Radharc M�"
-
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Feilire"
 
-#: calendar/gui/component-factory.c:72
+#: calendar/gui/calendar-component.c:71
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:76
+#: calendar/gui/calendar-component.c:75
 #, fuzzy
 msgid "Public Calendar"
 msgstr "Priont�il Feilire"
 
-#: calendar/gui/component-factory.c:77
+#: calendar/gui/calendar-component.c:76
 msgid "Public folder containing appointments and events"
 msgstr ""
 
 # tg
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
-#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1063
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Teascanna"
 
-#: calendar/gui/component-factory.c:82
+#: calendar/gui/calendar-component.c:81
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:86
+#: calendar/gui/calendar-component.c:85
 #, fuzzy
 msgid "Public Tasks"
 msgstr "Priont�il Carta�"
 
-#: calendar/gui/component-factory.c:87
+#: calendar/gui/calendar-component.c:86
 msgid "Public folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/calendar-component.c:730
 #, fuzzy
 msgid "New appointment"
 msgstr "Coinne Nua"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/calendar-component.c:730
 #, fuzzy
 msgid "_Appointment"
 msgstr "Coinne"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/calendar-component.c:731
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "Cruthaigh Coinne _Nua"
 
-#: calendar/gui/component-factory.c:755
+#: calendar/gui/calendar-component.c:735
 #, fuzzy
 msgid "New meeting"
 msgstr "Bealach Nuacht�in"
 
-#: calendar/gui/component-factory.c:755
+#: calendar/gui/calendar-component.c:735
 #, fuzzy
 msgid "_Meeting"
 msgstr "�lbachta�"
 
-#: calendar/gui/component-factory.c:756
+#: calendar/gui/calendar-component.c:736
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/component-factory.c:760
+#: calendar/gui/calendar-component.c:740
 #, fuzzy
 msgid "New task"
 msgstr "Teasc Nua"
 
-#: calendar/gui/component-factory.c:760
+#: calendar/gui/calendar-component.c:740
 msgid "_Task"
 msgstr "_Teasc"
 
-#: calendar/gui/component-factory.c:761
+#: calendar/gui/calendar-component.c:741
 #, fuzzy
 msgid "Create a new task"
 msgstr "Cruthaigh _Teasc Nua"
 
-#: calendar/gui/component-factory.c:765
+#: calendar/gui/calendar-component.c:745
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Coinne Nua"
 
-#: calendar/gui/component-factory.c:765
+#: calendar/gui/calendar-component.c:745
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Coinne"
 
-#: calendar/gui/component-factory.c:766
+#: calendar/gui/calendar-component.c:746
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Cruthaigh Coinne _Nua"
 
-#: calendar/gui/control-factory.c:123
-#, fuzzy, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Te�p ag fork: %s"
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
+msgid "Private"
+msgstr "Priobhdach"
 
-#: calendar/gui/control-factory.c:167
-msgid "The URI that the calendar will display"
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
+#: calendar/gui/e-calendar-table.c:373
+msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/control-factory.c:174
-msgid "The type of view to show"
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
+msgid "Public"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:359
-msgid "Audio Alarm Options"
-msgstr ""
+#: calendar/gui/calendar-model.c:522
+msgid "N"
+msgstr "T"
 
-#: calendar/gui/dialogs/alarm-options.c:368
-msgid "Message Alarm Options"
-msgstr ""
+#: calendar/gui/calendar-model.c:522
+msgid "S"
+msgstr "D"
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/calendar-model.c:524
+msgid "E"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:386
-msgid "Program Alarm Options"
-msgstr ""
+#: calendar/gui/calendar-model.c:524
+msgid "W"
+msgstr "I"
 
-#: calendar/gui/dialogs/alarm-options.c:395
-msgid "Unknown Alarm Options"
-msgstr ""
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
+#: calendar/gui/e-calendar-table.c:445
+msgid "Free"
+msgstr "Saor"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
-msgid "Alarm Repeat"
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
+msgid "Busy"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
+msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display"
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
+msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Play sound:"
-msgstr ""
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
+msgid "Completed"
+msgstr "Cr�ochnaithe"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Repeat the alarm"
+#: calendar/gui/calendar-model.c:1031
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Run program:"
-msgstr ""
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:79
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
+msgid "None"
+msgstr "Ar Bith"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "With these arguments:"
+#: calendar/gui/calendar-model.c:1706
+msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
-#: filter/filter.glade.h:20
-msgid "days"
-msgstr "lae"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "extra times every"
+#: calendar/gui/calendar-model.c:1708
+msgid "Assigned"
 msgstr ""
 
-# xh
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
-#: filter/filter.glade.h:21
-msgid "hours"
-msgstr "uair"
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
+#: calendar/gui/e-meeting-model.c:838
+msgid "Yes"
+msgstr "T�"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
-#: filter/filter.glade.h:22
-msgid "minutes"
-msgstr "noimea�d"
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
+msgid "No"
+msgstr "N�l"
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
-msgstr "%d la(e)"
+#: calendar/gui/calendar-view-factory.c:118
+msgid "Day View"
+msgstr "Radharc L�"
 
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
-msgstr " 1 l�"
+#: calendar/gui/calendar-view-factory.c:121
+msgid "Work Week View"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
-msgstr " %d seachtain"
+#: calendar/gui/calendar-view-factory.c:124
+msgid "Week View"
+msgstr "Radharc Seachtain"
 
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "1 seachtain"
+#: calendar/gui/calendar-view-factory.c:127
+msgid "Month View"
+msgstr "Radharc M�"
 
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
-msgstr " %d uaireanta"
+#: calendar/gui/comp-editor-factory.c:456
+msgid "Error while opening the calendar"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
-msgstr " 1 uair"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
-msgstr " %d noime�id"
+#: calendar/gui/comp-editor-factory.c:473
+msgid "Permission denied to open the calendar"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
-msgstr " 1 noime�d"
+#: calendar/gui/control-factory.c:119
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Te�p ag fork: %s"
 
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
-msgstr "%d soic�nd"
+#: calendar/gui/control-factory.c:165
+msgid "The URI that the calendar will display"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
-msgstr " 1 soic�nd"
+#: calendar/gui/control-factory.c:172
+msgid "The type of view to show"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
+#: calendar/gui/dialogs/alarm-options.c:420
+msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Taispe�in teachtaireacht"
+#: calendar/gui/dialogs/alarm-options.c:429
+msgid "Message Alarm Options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "Post r�omhphost"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
+msgstr "Taispea�n"
 
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
+#: calendar/gui/dialogs/alarm-options.c:447
+msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
+#: calendar/gui/dialogs/alarm-options.c:456
+msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s %s before the start of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "Alarm Repeat"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:416
-#, c-format
-msgid "%s %s after the start of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+msgid "Message to Display"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:421
-#, c-format
-msgid "%s at the start of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Scr�obh�ir"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Play sound:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:430
-#, c-format
-msgid "%s %s before the end of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:433
-#, c-format
-msgid "%s %s after the end of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "Run program:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:438
-#, c-format
-msgid "%s at the end of the appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Post"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:462
-#, c-format
-msgid "%s at %s"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
+msgid "days"
+msgstr "lae"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:468
-#, c-format
-msgid "%s for an unknown trigger type"
+#: calendar/gui/dialogs/alarm-options.glade.h:12
+msgid "extra times every"
 msgstr ""
 
+# xh
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
+msgid "hours"
+msgstr "uair"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
+msgid "minutes"
+msgstr "noimea�d"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4281,46 +4361,63 @@ msgstr ""
 msgid "Date/Time:"
 msgstr "D�ta/Am:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Taispe�in teachtaireacht"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Post r�omhphost"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Coimri�:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Roghanna..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "riomh"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "la(e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "deireadh an coinne"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "uair"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "noimea(i)d"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr ""
 
@@ -4345,7 +4442,7 @@ msgid "60 minutes"
 msgstr "60 noime�id"
 
 # DZ
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Alerts"
 msgstr "An Ailg�ir"
@@ -4371,7 +4468,8 @@ msgid "Days"
 msgstr "Lae"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Aoine"
 
@@ -4384,7 +4482,8 @@ msgid "Minutes"
 msgstr "Noimea�d"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Luain"
 
@@ -4394,7 +4493,8 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Sathairn"
 
@@ -4407,7 +4507,8 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1137
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Domhnaigh"
 
@@ -4425,7 +4526,8 @@ msgid "Task List"
 msgstr "L�osta _Teasc"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Deardaoin"
 
@@ -4442,7 +4544,8 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Mairt"
 
@@ -4451,7 +4554,8 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Ce�daoin"
 
@@ -4493,7 +4597,7 @@ msgid "_Fri"
 msgstr "_Aoi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr ""
 
@@ -4536,155 +4640,159 @@ msgstr "_Cea"
 msgid "before every appointment"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/dialogs/cancel-comp.c:56
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:59
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:65
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:74
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:77
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Earraidh gan aithne: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
 msgstr " (Cr�ochnaithe "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 msgid "Completed "
 msgstr "Cr�ochnaithe "
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Te�p ag fork: %s"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
 #, fuzzy
 msgid "Could not update object"
 msgstr "Te�p ag fork: %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Teasc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Gan coimri�"
 
-#: calendar/gui/dialogs/comp-editor.c:1221
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
-#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
 msgid "Save as..."
 msgstr "S�nbh�il le..."
 
-#: calendar/gui/dialogs/comp-editor.c:1322
-#: calendar/gui/dialogs/comp-editor.c:1346
-#: calendar/gui/dialogs/comp-editor.c:1370
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1331
+#: calendar/gui/dialogs/comp-editor.c:1355
+#: calendar/gui/dialogs/comp-editor.c:1379
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4742,88 +4850,99 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:433
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-msgid "A_ll day event"
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
+msgid "Start date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:610
+msgid "End date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:633
+msgid "Start time is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:640
+msgid "End time is wrong"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:2
+msgid "A_ll day event"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Data & Am"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "_Saor"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 #, fuzzy
 msgid "L_ocation:"
 msgstr "Fillte�n _Nua"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pr�obh�dach"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Coi_mri�:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Tadhalla�..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr ""
@@ -4832,19 +4951,23 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:414
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4884,16 +5007,11 @@ msgid "Member"
 msgstr "Ball"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr ""
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
@@ -4901,13 +5019,6 @@ msgstr ""
 msgid "Status"
 msgstr "St�das"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "Saghas"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4918,106 +5029,85 @@ msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-#, fuzzy
-msgid "st"
-msgstr "l�osta"
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-#, fuzzy
-msgid "nd"
-msgstr "Post"
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:75
+msgid "This and Future Instances"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:77
+msgid "All Instances"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-#, fuzzy
-msgid "rd"
-msgstr "r"
-
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-msgid "th"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:898
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 #, fuzzy
 msgid "first"
 msgstr "l�osta"
 
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "soic�nd"
 
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
 #, fuzzy
 msgid "third"
 msgstr "Eile"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 #, fuzzy
 msgid "fourth"
 msgstr "Tuaisceart"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 #, fuzzy
 msgid "last"
 msgstr "l�osta"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 #, fuzzy
 msgid "Other Date"
 msgstr "Facs Eile"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "l�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr ""
 
@@ -5083,22 +5173,27 @@ msgstr "Seachta(i)n"
 msgid "year(s)"
 msgstr "blia(i)n"
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:59
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:70
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
+#: calendar/gui/dialogs/task-details-page.c:397
+#, fuzzy
+msgid "Completed date is wrong"
+msgstr "Cr�ochnaithe "
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -5109,42 +5204,40 @@ msgstr "% Rinneadh:"
 msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
-msgid "Needs Action"
-msgstr "Freagra"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:860
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "Tosa�ocht"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_St�das:"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Gn�th"
 
-#: calendar/gui/dialogs/task-editor.c:216
-#: calendar/gui/dialogs/task-editor.c:261
-#: calendar/gui/dialogs/task-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
+#: calendar/gui/dialogs/task-page.c:527
+msgid "Due date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Tuarasc�il:"
 
@@ -5152,143 +5245,240 @@ msgstr "Tuarasc�il:"
 msgid "Sta_rt Date:"
 msgstr ""
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Tadhalla�..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d la(e)"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr " 1 l�"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr " %d seachtain"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 seachtain"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr " %d uaireanta"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr " 1 uair"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr " %d noime�id"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr " 1 noime�d"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d soic�nd"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr " 1 soic�nd"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Post r�omhphost"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:418
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:419
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:420
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:421
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:422
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:423
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-calendar-table.c:424
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-calendar-table.c:425
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
-#: calendar/gui/e-week-view.c:1917
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1910
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
-#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
-#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Osc�il"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 #, fuzzy
 msgid "_Save as..."
 msgstr "S�nbh�il le..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
-#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Priont�il..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
-#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "G_earr"
 
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
-#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_C�ip"
 
 # PS
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
-#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Paste"
 msgstr "_Greamaigh"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr ""
 
 # ln
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Liong�ilis"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "% Rinneadh:"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
-#: calendar/gui/e-week-view.c:4240
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4269
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1360
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -5303,8 +5493,8 @@ msgstr ""
 msgid "Alarms"
 msgstr "Af�iris"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1096
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr ""
 
@@ -5333,8 +5523,8 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:748
-#: shell/e-shortcuts.c:1051
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Coimri�"
 
@@ -5342,19 +5532,15 @@ msgstr "Coimri�"
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:166
+#: e-util/e-time-utils.c:379
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:161
+#: e-util/e-time-utils.c:388
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -5366,501 +5552,578 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:518
+#: calendar/gui/e-day-view-time-item.c:529
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
 msgid "am"
 msgstr "rn"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
 msgid "pm"
 msgstr "in"
 
-#: calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "_Coinne Nua"
 
-#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 #, fuzzy
 msgid "New Meeting"
 msgstr "Bealach Nuacht�in"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "Teasc Nua"
 
-#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Cl�d�il..."
 
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "�lbachta�"
 
-#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
-#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_S�bh�il Mar..."
 
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Ag Fanacht..."
 
-#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Ag L�d�il feilire..."
 
-#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+msgid "Yes. (Complex Recurrence)"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "Gach"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d la(e)"
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "Gach"
+
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr " %d seachtain"
+
+#: calendar/gui/e-itip-control.c:729
+msgid "Every week on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:731
+#, fuzzy, c-format
+msgid "Every %d weeks on "
+msgstr " %d seachtain"
+
+#: calendar/gui/e-itip-control.c:739
+msgid " and "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:746
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:764
+#, fuzzy
+msgid "every month"
+msgstr "Aon _mh�"
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:775
+#, fuzzy
+msgid "Every year"
+msgstr "Gach"
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:831
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Cr�ochnaithe "
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "eolas fheilire"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Feilire"
 
-#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
-#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 #, fuzzy
 msgid "An unknown person"
 msgstr "iEarraidh gan Aithne"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Ar bith</i>"
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Location:"
 msgstr "Fillte�n _Nua"
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
 #, fuzzy
 msgid "Status:"
 msgstr "_St�das:"
 
-#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:490
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
-#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:444
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "Gan Aithne"
 
-#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Fillte�n _Nua"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
 #, fuzzy
 msgid "Update"
 msgstr "Data"
 
-#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ceart go Leor"
 
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Accept"
 msgstr "Cuntas"
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Decline"
 msgstr "Dealaigh"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1226
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Eolas Theasc"
 
 # FR
-#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
-#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
 #, fuzzy
 msgid "Cancel"
 msgstr "An Fhrainc"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
 #, fuzzy
 msgid "Meeting Information"
 msgstr "eolas fheilire"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "_Dealaigh gach rud"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
 #, fuzzy
 msgid "Meeting Update"
 msgstr "�lbachta�"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Freagrair"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
-#: calendar/gui/e-itip-control.c:1245
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1363
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Post an sce�l seo"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Eolas Theasc"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
 #, fuzzy
 msgid "Task Update"
 msgstr "Data"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
 #, fuzzy
 msgid "Task Reply"
 msgstr "Freagrair"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Eolas Theasc"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1430
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Teachtaireacht Feilire"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1450
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1460
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Freagrair"
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1465
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Post an sce�l seo"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1441
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1916
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Te�p ag fork: %s"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1739
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:2008
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Te�p ag fork: %s"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2206
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Fillte�n _Nua"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Fillte�n _Nua"
@@ -5905,184 +6168,189 @@ msgid "date-start"
 msgstr ""
 
 # FIXME (Plural)
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Cathlaoirlaig"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Resources"
 msgstr "Goireas"
 
 # IN 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr "Pearsanta"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:831
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "Goireas"
 
-#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr "Seomra"
 
 # th
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:822
 #, fuzzy
 msgid "Chair"
 msgstr "T�alainnis"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
+#: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
+#: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+msgid "Needs Action"
+msgstr "Freagra"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:879
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2114
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
+#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "As an Oifig"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Gan Eolas"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Roghanna"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:544
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
 #: calendar/gui/gnome-cal.c:2024
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Te�p ag fork: %s"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6091,30 +6359,30 @@ msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %s\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Coinne Nua..."
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1541
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -6124,13 +6392,12 @@ msgstr ""
 # ## 	The 'msgid' names and spellings for languages are those listed
 # ##     in iso-639.def from glibc
 # aa 
-#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1581
+#: calendar/gui/gnome-cal.c:1563
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alairm on %s"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6138,7 +6405,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6146,7 +6413,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1996
+#: calendar/gui/gnome-cal.c:1995
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Osc�il Feilire"
@@ -6220,331 +6487,190 @@ msgstr "D. F�mhair"
 msgid "September"
 msgstr "M. F�mhair"
 
-#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 #, fuzzy
 msgid "Event information"
 msgstr "eolas fheilire"
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 #, fuzzy
 msgid "Task information"
 msgstr "Eolas Theasc"
 
-#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 #, fuzzy
 msgid "Journal information"
 msgstr "Eolas Cuntais"
 
-#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Eolas"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 #, fuzzy
 msgid "Calendar information"
 msgstr "eolas fheilire"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 #, fuzzy
 msgid "Updated"
 msgstr "Data"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
 #, fuzzy
 msgid "Refresh"
 msgstr "Freagrair"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:513
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Eolas"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 #, fuzzy
 msgid "iCalendar information"
 msgstr "eolas fheilire"
 
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:70
-#, fuzzy
-msgid "Could not activate Bonobo"
-msgstr "Te�p ag fork: %s"
-
-#: calendar/gui/main.c:99
-msgid "Could not create the component editor factory"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "1st"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "2nd"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "3rd"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "4th"
-msgstr ""
-
-#: calendar/gui/print.c:456
-msgid "5th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "6th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "7th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "8th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "9th"
-msgstr ""
-
-#: calendar/gui/print.c:457
-msgid "10th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "11th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "12th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "13th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "14th"
-msgstr ""
-
-#: calendar/gui/print.c:458
-msgid "15th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "16th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "17th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "18th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "19th"
-msgstr ""
-
-#: calendar/gui/print.c:459
-msgid "20th"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "21st"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "22nd"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "23rd"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "24th"
-msgstr ""
-
-#: calendar/gui/print.c:460
-msgid "25th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "26th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "27th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "28th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "29th"
-msgstr ""
-
-#: calendar/gui/print.c:461
-msgid "30th"
-msgstr ""
-
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr ""
-
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Ce"
 
 # th
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 #, fuzzy
 msgid "Th"
 msgstr "T�alainnis"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Ao"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
-#: calendar/gui/print.c:1896
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr ""
 
 # tg
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 #, fuzzy
 msgid "Task"
 msgstr "T�ids�cis"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "_St�das:"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "Tosa�ocht"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Cr�ochnaithe.`"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2370
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL:"
 
-#: calendar/gui/print.c:2364
+#: calendar/gui/print.c:2384
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr ""
 "\n"
 "Aicm�:"
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 #, fuzzy
 msgid "Contacts: "
 msgstr ""
 "\n"
 "Tr�cht:"
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Priont�il Feilire"
-
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
-#: my-evolution/e-summary.c:633
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "Priont�il Reamhtaispe�ntais"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Socraigh Priont�il "
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:472
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6552,90 +6678,66 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
-#: mail/mail-callbacks.c:2912
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Priont�il Carta�"
 
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:108
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:120
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:133
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
 msgid "SMTWTFS"
 msgstr "LMCDASD"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr ""
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Evolution "
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr ""
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Evolution "
 
-#: calendar/importers/icalendar-importer.c:168
-#, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr ""
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Teachtaireacht Feilire"
 
-#: calendar/importers/icalendar-importer.c:180
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:483
+#: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Teachtaireacht Feilire"
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:663
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Feilire"
 
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr ""
@@ -8340,27 +8442,35 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+msgid "You may not import keys with this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:374
+msgid "You may not export keys with this cipher"
+msgstr ""
+
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Te�p ag fork: %s"
@@ -8394,104 +8504,111 @@ msgstr "Ag oscailt an t-eolaire %s"
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Te�p ag fork: %s"
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-process.c:92
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Te�p ag fork: %s"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Te�p ag fork: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 #, fuzzy
 msgid "Syncing folder"
 msgstr "ag sioncronaich filtean"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "_Post sce�l"
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Te�p ag fork: %s"
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Te�p ag fork: %s"
-
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -8521,7 +8638,7 @@ msgstr "Post an sce�l seo"
 msgid "Copying messages"
 msgstr "Post an sce�l seo"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8529,70 +8646,71 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:711
+#: camel/camel-gpg-context.c:738
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:761
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:769
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
-#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
-#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr "Ceangailte."
 
-#: camel/camel-gpg-context.c:771
+#: camel/camel-gpg-context.c:798
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1082
+#: camel/camel-gpg-context.c:1125
 #, fuzzy, c-format
 msgid ""
-"Failed to GPG %s message: %s\n"
+"Failed to GPG %s: %s\n"
 "\n"
 "%.*s"
 msgstr "_Post sce�l"
 
-#: camel/camel-gpg-context.c:1088
+#: camel/camel-gpg-context.c:1131
 #, fuzzy, c-format
-msgid "Failed to GPG %s message: %s\n"
+msgid "Failed to GPG %s: %s\n"
 msgstr "_Post sce�l"
 
-#: camel/camel-gpg-context.c:1197
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "_Post sce�l"
 
-#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
-#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
-#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "_Post sce�l"
 
-#: camel/camel-gpg-context.c:1290
+#: camel/camel-gpg-context.c:1333
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8617,23 +8735,22 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr "Te�p ag fork: %s"
 
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:93 camel/camel-lock.c:112
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:152
+#: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:268
+#: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -8643,51 +8760,51 @@ msgstr ""
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:157
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(Earraidh gan aithne)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
@@ -8704,26 +8821,26 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 #, fuzzy
 msgid "parse error"
 msgstr "Earraidh Eile"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
@@ -8771,60 +8888,129 @@ msgid ""
 "the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-gssapi.c:48
+msgid "GSSAPI"
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:50
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:148
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:153
+msgid "The provided target_name parameter was ill-formed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:156
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:160
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:165
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:169
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:180
+msgid "The consistency checks performed on the credential failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:183
+msgid "The referenced credentials have expired."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
+msgid "Bad authentication response from server."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Te�p ag fork: %s"
+
+#: camel/camel-sasl-gssapi.c:299
+msgid "Unsupported security layer."
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr ""
-
 #: camel/camel-sasl-login.c:32
 #, fuzzy
 msgid "Login"
@@ -8872,7 +9058,7 @@ msgstr ""
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
@@ -8892,36 +9078,36 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:774 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 #, fuzzy
 msgid "Resolving address"
 msgstr "Ag dealaigh fillte�n %s"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8933,185 +9119,185 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:354 camel/camel-session.c:422
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:171
 #, c-format
 msgid "Please enter your password for %s"
 msgstr ""
 
-#: camel/camel-smime-context.c:203
+#: camel/camel-smime-context.c:201
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr ""
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr ""
 
-#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
+#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr ""
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr ""
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 #, fuzzy
 msgid "Failed to decode message."
 msgstr "_Post sce�l"
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "T�g Comhad"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 #, fuzzy
 msgid "Out of memory"
 msgstr "As an Oifig"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9120,15 +9306,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9141,7 +9327,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:690
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9151,35 +9337,35 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:734
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:786
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:804
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -9196,40 +9382,40 @@ msgstr ""
 msgid "No such message %s in %s"
 msgstr "Ni raibh aon sceal %s i %s"
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Fillte�n _Nua"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Te�p ag fork: %s"
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2611
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2614
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -9252,78 +9438,78 @@ msgstr ""
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:655
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:691
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:221
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:240
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:306
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:548
+#: camel/providers/imap/camel-imap-folder.c:549
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Ag S�bh�il scealta"
 
-#: camel/providers/imap/camel-imap-folder.c:1872
+#: camel/providers/imap/camel-imap-folder.c:1873
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "_Post sce�l"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
 #, fuzzy
 msgid "No such message"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/imap/camel-imap-folder.c:1931
-#: camel/providers/imap/camel-imap-folder.c:2527
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2191
-#: camel/providers/imap/camel-imap-folder.c:2261
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2565
+#: camel/providers/imap/camel-imap-folder.c:2567
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9353,7 +9539,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "Fillte�in"
 
@@ -9383,7 +9569,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Pasfhocal"
 
@@ -9401,59 +9587,58 @@ msgstr "SMTP freastala� %s"
 msgid "IMAP service for %s on %s"
 msgstr "SMTP freastala� %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: camel/providers/imap/camel-imap-store.c:1082
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1092
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1116
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1131
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1160
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9461,24 +9646,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1462
-#: camel/providers/imap/camel-imap-store.c:1604
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1851
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Earraidh gan aithne: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9552,8 +9737,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -9565,36 +9750,36 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:394
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9604,7 +9789,7 @@ msgstr ""
 msgid "Could not save summary: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-local-summary.c:454
+#: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9618,14 +9803,14 @@ msgstr "_Post sce�l"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9635,14 +9820,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:168
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9655,80 +9840,80 @@ msgid "`%s' is not a maildir directory."
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-maildir-store.c:205
 #: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:282
-#: camel/providers/local/camel-spool-store.c:312
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:416
-#: camel/providers/local/camel-maildir-summary.c:545
+#: camel/providers/local/camel-maildir-summary.c:417
+#: camel/providers/local/camel-maildir-summary.c:548
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 msgid "Checking folder consistency"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Ag S�bh�il scealta"
 
-#: camel/providers/local/camel-maildir-summary.c:729
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:583
-#: camel/providers/local/camel-mbox-summary.c:673
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Ag stoir filtean"
 
-#: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:396
-#: camel/providers/local/camel-mbox-folder.c:404
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -9765,75 +9950,75 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:350
+#: camel/providers/local/camel-mbox-summary.c:343
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:398
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:453
+#: camel/providers/local/camel-mbox-summary.c:447
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:678
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-spool-summary.c:169
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-mbox-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:621
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:716
-#: camel/providers/local/camel-mbox-summary.c:724
-#: camel/providers/local/camel-mbox-summary.c:913
-#: camel/providers/local/camel-mbox-summary.c:921
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:848
-#: camel/providers/local/camel-spool-summary.c:332
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Earraidh gan aithne: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:812
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:976
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:993
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -9852,67 +10037,67 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr "N�l aon Eolaire `%s' ann."
 
-#: camel/providers/local/camel-mh-summary.c:243
+#: camel/providers/local/camel-mh-summary.c:244
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "N�l aon Eolaire `%s' ann."
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:176
+#: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "N�l aon Eolaire `%s' ann."
 
-#: camel/providers/local/camel-spool-store.c:193
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool folder tree %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:181
-#: camel/providers/local/camel-spool-summary.c:190
-#: camel/providers/local/camel-spool-summary.c:199
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-spool-summary.c:214
+#: camel/providers/local/camel-spool-summary.c:211
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-spool-summary.c:244
-#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
 #: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
@@ -9991,44 +10176,44 @@ msgid "Retrieving POP summary"
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:427
-#: camel/providers/pop3/camel-pop3-folder.c:486
-#: camel/providers/pop3/camel-pop3-folder.c:503
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
 #, fuzzy
 msgid "User cancelled"
 msgstr "Ceangailte"
 
-#: camel/providers/pop3/camel-pop3-folder.c:264
+#: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Scr�os an sceal seo"
 
-#: camel/providers/pop3/camel-pop3-folder.c:401
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:408
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:488
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 #, fuzzy
 msgid "Unknown reason"
 msgstr "iEarraidh gan Aithne"
@@ -10046,7 +10231,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr "Scrios indiath %s la(e)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -10067,66 +10252,66 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:614
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "N�l aon eolaire `%s' ann."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10136,50 +10321,50 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 #, fuzzy
 msgid "Could not parse recipient list"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10187,135 +10372,135 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:342
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
@@ -10342,12 +10527,12 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 #, fuzzy
 msgid "Sending message"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
@@ -10355,62 +10540,62 @@ msgstr ""
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "HELO response error"
 msgstr "Earraidh Eile"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10418,77 +10603,77 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:102
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:113
+#: composer/e-msg-composer-attachment-bar.c:108
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "iat�n"
 
-#: composer/e-msg-composer-attachment-bar.c:520
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: composer/e-msg-composer-attachment.c:177
+#: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -10508,11 +10693,15 @@ msgid "MIME type:"
 msgstr ""
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:163
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr ""
 
@@ -10523,7 +10712,7 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:400
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr ""
 
@@ -10531,38 +10720,38 @@ msgstr ""
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "�:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:436
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:440
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10571,75 +10760,79 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "_Poirt:"
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "(Gan Tuarascail)"
 
-#: composer/e-msg-composer-select-file.c:275
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr ""
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
+msgstr "_Iat�n"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Te�p ag fork: %s"
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "Rabhadh!"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1285
+#, c-format
+msgid ""
+"Unable to copy file descriptor: %s\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:1294
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10648,13 +10841,13 @@ msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1388
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10662,35 +10855,40 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1536
+#: composer/e-msg-composer.c:1555
+msgid "_Discard Changes"
+msgstr ""
+
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Osc�il Comhad"
 
 # SG
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Signature:"
 msgstr "Singeap�r"
 
-#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2796
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2822
+#: composer/e-msg-composer.c:2931
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10698,31 +10896,18 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3858
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:393
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-
-#: composer/evolution-composer.c:408
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr ""
-"Go raibh maith agat\n"
-"An Fhoireann Evolution\n"
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr ""
@@ -10772,26 +10957,131 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
-#: mail/mail-display.c:192
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:4
+#, fuzzy
+msgid "<b>Out of Office Message:</b>"
+msgstr "As an Oifig"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "_St�das:"
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:12
+#, fuzzy
+msgid "Out of Office Assistant"
+msgstr "As an Oifig"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "St�das"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+msgid "<b>Receiving Email</b>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "Post r�omhphost"
+
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:9
+msgid "Read Receipts"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
+#: e-util/e-component-listener.c:128
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr ""
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr ""
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 #, fuzzy
 msgid "Sync Categories:"
 msgstr ""
@@ -10800,209 +11090,228 @@ msgstr ""
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:171 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:176 e-util/e-time-utils.c:375
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:181
 #, fuzzy
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:186
 #, fuzzy
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:197
 #, fuzzy
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:201
 #, fuzzy
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:206
 #, fuzzy
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:211
 #, fuzzy
 msgid "%m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:216
 #, fuzzy
 msgid "%m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:221
 #, fuzzy
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:325 e-util/e-time-utils.c:424
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:329 e-util/e-time-utils.c:416
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
+#: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
+#: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:342
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:181
-msgid "seconds"
-msgstr "soicind"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr " 1 soic�nd"
 
-#: filter/filter-datespec.c:71
-msgid "minute"
-msgstr ""
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d soic�nd"
 
-# ug
-#: filter/filter-datespec.c:72
+#: filter/filter-datespec.c:66
 #, fuzzy
-msgid "hour"
-msgstr "��ghur"
+msgid "1 minute ago"
+msgstr " 1 noime�d"
 
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "seachtain"
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr " %d noime�id"
 
-# el 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
+#: filter/filter-datespec.c:67
 #, fuzzy
-msgid "weeks"
-msgstr "seachtin"
+msgid "1 hour ago"
+msgstr " 1 uair"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr " %d uaireanta"
+
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr " 1 l�"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr "%d la(e)"
 
-#: filter/filter-datespec.c:75
-msgid "month"
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 seachtain"
+
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr " %d seachtain"
+
+#: filter/filter-datespec.c:70
+#, fuzzy
+msgid "1 month ago"
 msgstr "m�"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
-msgstr ""
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr " %d noime�id"
 
-#: filter/filter-datespec.c:76
-msgid "year"
-msgstr "bliain"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "bliana"
+# FIXME : Grammar ? 
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr "%d carta�"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 #, fuzzy
 msgid "You must choose a date."
 msgstr "Ainm St�l:"
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "anois"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:279
+#: filter/filter-datespec.c:285
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%a %d %b %Y"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
-#, c-format
-msgid "%d %s ago"
-msgstr ""
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "Fillte�n _Nua"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr ""
 
-#: filter/filter-file.c:178
+#: filter/filter-file.c:166
 #, fuzzy
-msgid "You must specify a file name"
+msgid "You must specify a file name."
 msgstr "Ainm St�l:"
 
-#: filter/filter-file.c:190
+#: filter/filter-file.c:184
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "N�l aon Eolaire `%s' ann."
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 #, fuzzy
 msgid "Choose a file"
 msgstr "Fillte�n _Nua"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr ""
-
-#: filter/filter-folder.c:149
+#: filter/filter-folder.c:155
 #, fuzzy
-msgid "You must specify a folder.\n"
+msgid "You must specify a folder."
 msgstr "Ainm St�l:"
 
-#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 #, fuzzy
 msgid "Select Folder"
 msgstr "Fillte�n _Nua"
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -11010,78 +11319,76 @@ msgid ""
 msgstr ""
 
 # IR
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:62
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
 msgid "Important"
 msgstr ""
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133
+#: filter/filter-label.c:122 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 #, fuzzy
 msgid "Work"
 msgstr "Ag Obair"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1281
 #, fuzzy
 msgid "Personal"
 msgstr "Gn�th"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124
+#: filter/filter-label.c:124 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1283
 #, fuzzy
 msgid "Later"
 msgstr "Bainisteoir"
 
-#: filter/filter-part.c:545 shell/evolution-test-component.c:49
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test"
 msgstr "An Tib�id"
 
-#: filter/filter-rule.c:223
+#: filter/filter-rule.c:219
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "Gan Tid�al"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr ""
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr ""
 
@@ -11123,7 +11430,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr ""
 
@@ -11135,6 +11442,14 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr ""
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "soicind"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr ""
@@ -11151,6 +11466,12 @@ msgstr ""
 msgid "vFolder Sources"
 msgstr ""
 
+# el 
+#: filter/filter.glade.h:29
+#, fuzzy
+msgid "weeks"
+msgstr "seachtin"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
@@ -11163,6 +11484,10 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "bliana"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11293,7 +11618,7 @@ msgid "is not Flagged"
 msgstr ""
 
 # PE
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 #, fuzzy
 msgid "Label"
 msgstr "_Larger"
@@ -11324,7 +11649,7 @@ msgstr ""
 msgid "Play Sound"
 msgstr "An Pholainn"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr ""
 
@@ -11354,12 +11679,12 @@ msgid "returns less than"
 msgstr ""
 
 # Avoid; either use KR or KP
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Sc�r"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr ""
 
@@ -11396,8 +11721,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Abair"
 
@@ -11407,75 +11733,92 @@ msgstr "Abair"
 msgid "Unset Status"
 msgstr "St�it Aontaithe Mheirice�"
 
-#: filter/rule-editor.c:180
-msgid "Rules"
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
+#, c-format
+msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:239 filter/rule-editor.c:335
-#, c-format
-msgid "Rule name '%s' is not unique, choose another"
+#: filter/rule-editor.c:170
+msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr ""
 
-#: filter/score-editor.c:130
+# vi
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "Bh�tneaimis"
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "_Fillte�n"
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "Fillte�in"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr ""
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr "F�n le do thoil"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Ag Oscailt '%s'"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:353
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
 msgstr "Post"
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11485,12 +11828,12 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Tosa�ocht"
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11505,7 +11848,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11513,7 +11856,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11522,461 +11865,455 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
-#: shell/e-local-storage.c:183
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Bruscar"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Ag Oscailt '%s'"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "�lbachta�"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 #, fuzzy
 msgid "Mail Filters"
 msgstr "_Fillte�n"
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
 # PS
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 #, fuzzy
 msgid "Composer Preferences"
 msgstr "Roghanna Feilire"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure the fonts used by Evolution here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Evolution mail composer."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Alairm Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Alairm Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Socr� Post"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution - Cruthaigh fillte�n nua"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Evolution Mail font configuration control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution - Cruthaigh fillte�n nua"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
 msgid "Font Preferences"
 msgstr "Roghanna Feilire"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Cuntasa�"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Roghanna Feilire"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr ""
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr ""
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "�lbachta�..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:805
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:970
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:998
-#, fuzzy
-msgid "Warning: Unsent Messages"
-msgstr "Ag S�bh�il scealta"
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Teachaireacht Post Nua"
 
 # mt
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_Sc�al R�omhphost"
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Cruthaigh Sc�al _Nua"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Sce�l Nua"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "Post an sce�l seo"
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Teachaireacht Post Nua"
 
-#: mail/component-factory.c:1078
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Alairm Evolution"
-
-#: mail/component-factory.c:1087
-msgid "Cannot initialize Evolution's mail config component."
-msgstr ""
-
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's folder info component."
-msgstr ""
-
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ag Cealaigh..."
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Albachta� do \"%s\""
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "�lbacta�"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d nua"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr ""
 
 # c-format
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "%d �oml�n"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Fillte�n _Nua"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_Priont�il"
 
-#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Freagrair do L�osta"
 
-#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Freagrair do _Gach rud"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1771
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Cr�ochnaithe"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Glan"
 
 #. separator here?
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Athdealaigh"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_C�ip do Fillte�n..."
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Suim Leabhar Seoladh"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Teachtaireacht Feilire"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Gn�th"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 #, fuzzy
 msgid "Getting Folder Information"
 msgstr "eolas fheilire"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr ""
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution "
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Eagarth�ir Nuachr�in Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Eagarth�ir Nuachr�in Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Eagarth�ir Nuachr�in Evolution"
+
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr ""
@@ -12009,100 +12346,100 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:159
+#: mail/mail-account-editor.c:146
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_�st:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Ainm _�saideoir"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_Sl�:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr ""
-
-#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr "M�chumasach"
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr "Chumasach"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
+#, fuzzy
+msgid "[Default]"
+msgstr "Gn�th"
+
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Ainm _Chuntas:"
 
-#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Portr�id"
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Post do %s"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Abair is %s"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Sc�al � %s"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "l�osta r�omhphost %s"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:376
+#: mail/mail-autofilter.c:372
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12110,7 +12447,12 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:154
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr ""
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -12118,223 +12460,241 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:211
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:254
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Post ar aon n�s?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:356
+#: mail/mail-callbacks.c:313
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:364
+#: mail/mail-callbacks.c:322
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:777
+#: mail/mail-callbacks.c:722
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Am %a, %Y-%m-%d ag %H:%M, scr�obh %%s:"
 
-#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr "Te�p ag fork: %s"
+
+#: mail/mail-callbacks.c:2470
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "S�bh�il Sc�al Mar..."
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "S�bh�il Sc�ala Mar..."
 
-#: mail/mail-callbacks.c:2655
-#, fuzzy
-msgid "Go to next folder with unread messages?"
-msgstr "Scr�os an sceal seo"
-
-#: mail/mail-callbacks.c:2662
-msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2905
+#: mail/mail-callbacks.c:2687
 msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:3156
-msgid "US-Letter"
-msgstr ""
-
-#: mail/mail-callbacks.c:3197
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3387
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:223
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+msgid "Unnamed"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
+#: mail/mail-composer-prefs.c:335
 #, fuzzy
-msgid " [script]"
-msgstr "(Gan Tuarascail)"
+msgid "You must specify a valid script name."
+msgstr "Ainm St�l:"
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
-msgstr ""
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+#, fuzzy
+msgid "[script]"
+msgstr "(Gan Tuarascail)"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
-msgid "Unnamed"
-msgstr ""
+#: mail/mail-composer-prefs.c:864
+#, fuzzy
+msgid "Language(s)"
+msgstr "Teanga"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr ""
 
-# SG
-#: mail/mail-composer-prefs.c:876
+#: mail/mail-composer-prefs.c:926
 #, fuzzy
-msgid "Add Signature"
-msgstr "Singeap�r"
+msgid "Signature(s)"
+msgstr "_St�das:"
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr ""
+
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "_Dealaigh gach rud"
+
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Post r�omhphost"
+
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Bainisteoireacht Chuntas"
+
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12343,442 +12703,421 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:637
-msgid "Evolution Account Assistant"
-msgstr ""
-
-#: mail/mail-config.c:622
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "Cuntas"
-
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2394 mail/mail-config.c:2398
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr ""
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Account Editor"
 msgstr "Cuntas %d"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Eolas Cuntais"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Bainisteoireacht Chuntas"
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "_Sl�nd�il"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "�dar�"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "Automatically _detect links"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Earraidh gan aithne: %s"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "C_olors"
 msgstr "_D�n"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Cruthaigh Sc�al _Nua"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Socr�"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Gn�th"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Tosa�ocht"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "_Dealaigh gach rud"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Cr�ochnaithe"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Gach _Fillte�in:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Cumasach"
 
 # ta
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Emacs"
 msgstr "Rpost"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Cuntasa�"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "_Seoladh RPost:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Font Properties"
 msgstr "�lbacta�"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr ""
-
 # ie
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "S�bh�il agus D�n"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Socr� Post"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "�it do Bosca Phoist"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Scr�obh�ir"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "_Post sce�l"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "sce�l"
+
+#: mail/mail-config.glade.h:76
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Socr� Post"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "On Screen fonts"
-msgstr ""
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Eagr�:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Eochar PGP:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "T�g dath"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Priont�il an tadhalla� seo"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Freagrair-Do"
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "_Roghanna"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Gn�th"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Sl�nd�il"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "_Post sce�l filtean"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Ainm St�l:"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr ""
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
@@ -12816,7 +13155,7 @@ msgstr "Luaineach"
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 
 #: mail/mail-config.glade.h:134
@@ -12885,111 +13224,114 @@ msgid "_Enable"
 msgstr "Chumasach"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Full name:"
 msgstr "Ainm _Fhada:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "i HTML post"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Ainm:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Freagrair do gach rud"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Script:"
 msgstr "_Sl�nd�il"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Post r�omhphost"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_St�das:"
 
+#: mail/mail-config.glade.h:174
+msgid "_Standard Font:"
+msgstr ""
+
 #: mail/mail-config.glade.h:175
-msgid "_Use secure connection (SSL):"
+msgid "_Terminal Font:"
 msgstr ""
 
 #: mail/mail-config.glade.h:176
-#, fuzzy
-msgid "_Variable-width:"
-msgstr "Luaineach"
+msgid "_Use secure connection (SSL):"
+msgstr ""
 
 #: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "_gach"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "color"
 msgstr " dath"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr ""
 
@@ -13013,194 +13355,196 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "_Iat�n"
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Osc�il san %s..."
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
 #, fuzzy
 msgid "Downloading images"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "S�bh�il Iomha le..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Ag Oscailt '%s'"
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
-#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:783 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "D�ta"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Droch Seoladh"
 
-#: mail/mail-format.c:913 mail/message-list.etspec.h:7
-#: mail/message-tags.glade.h:3
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr "�"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Freagrair-Do"
 
-#: mail/mail-format.c:922 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Do"
 
-#: mail/mail-format.c:927
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:932
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:963
-#, fuzzy
-msgid "Mailer"
-msgstr "Post"
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1892
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "_Fillte�n"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:748
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
@@ -13210,19 +13554,19 @@ msgstr ""
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1351
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
 # c-format
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
@@ -13240,117 +13584,117 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Ag Obair"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:553 mail/mail-ops.c:582
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
 msgid "Complete."
 msgstr "Cr�ochnaithe.`"
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ag dealaigh fillte�n %s"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ag S�bh�il scealta"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13359,66 +13703,66 @@ msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "C_uardaigh..."
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Sc�al gan tide�l)"
 
 # US
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Sc�al Gan Tid�al"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Sce�l F�lamh"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr ""
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "Cuardaigh"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Cuardaigh:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr ""
 
@@ -13426,113 +13770,117 @@ msgstr ""
 msgid "Cancelling..."
 msgstr "Ag Cealaigh..."
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Freastala�: %s, Cin�al: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sl�: %s, Cin�al: %s"
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr "Cin�al:  %s"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "Cealaigh gach rud"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
 msgid "Waiting..."
 msgstr "Ag Fanacht..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:272
-#, fuzzy
-msgid "_Remember this password"
-msgstr "Scr�os an teasc seo"
-
-#: mail/mail-session.c:273
-msgid "_Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-session.c:330
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:280
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Scr�os an teasc seo"
+
+#: mail/mail-session.c:281
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-signature-editor.c:80
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr ""
-
-#: mail/mail-signature-editor.c:181
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
+#: mail/mail-signature-editor.c:229
+msgid "_Discard changes"
+msgstr ""
+
+#: mail/mail-signature-editor.c:233
+msgid "Save signature"
+msgstr ""
+
 # SG
-#: mail/mail-signature-editor.c:333
+#: mail/mail-signature-editor.c:389
 #, fuzzy
 msgid "Edit signature"
 msgstr "Singeap�r"
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:429
 msgid "Enter a name for this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Ainm:"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13541,98 +13889,98 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 #, fuzzy
 msgid "vFolders"
 msgstr "Fillte�in"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Fillte�n _Nua"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Gan abair)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Sce�l"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1066
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "Inni� %l:%M %p"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Inn� %l:%M %p"
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2568
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr ""
 
@@ -13666,49 +14014,49 @@ msgstr ""
 msgid "Size"
 msgstr "M�id"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
 msgstr "Post"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:64
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:65
 #, fuzzy
 msgid "For Your Information"
 msgstr "Gan Eolas"
 
 # NO
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 #, fuzzy
 msgid "Forward"
 msgstr "Sheoladh"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Freagrair"
 
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Freagrair do gach rud"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 #, fuzzy
 msgid "Review"
 msgstr "Reamhthaispe�intas"
 
-#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13737,53 +14085,44 @@ msgstr ""
 msgid "_Flag:"
 msgstr "Ainm Chomad:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Fillte�n"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "All folders"
-msgstr "Gach Fillte�in"
-
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "Aibre�in"
-
 #: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -13794,62 +14133,46 @@ msgid "Close"
 msgstr "D�n"
 
 #: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Display Options"
-msgstr "Taispea�n"
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Fillte�n _Nua"
 
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "T�g Comhad"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr ""
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Configuration control for the Evolution Summary."
-msgstr ""
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr ""
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Summary component."
+msgid "Evolution Summary"
 msgstr "Alairm Evolution"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
-msgid "Factory for Evolution Summary's configuration control."
-msgstr ""
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Summary component"
+msgstr "Alairm Evolution"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
-msgid "Factory for the Evolution Summary component."
-msgstr ""
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Alairm Evolution"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 #, fuzzy
 msgid "Summary Preferences"
 msgstr "Roghanna Feilire"
@@ -17748,7 +18071,7 @@ msgid "Hagerstown"
 msgstr ""
 
 #. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
 msgid "Hail"
 msgstr ""
 
@@ -19615,6523 +19938,6514 @@ msgid "Marion-Wytheville"
 msgstr ""
 
 #: my-evolution/Locations.h:1325
-msgid "Marquette"
-msgstr ""
-
-#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr ""
 
 # mr
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 #, fuzzy
 msgid "Marshall"
 msgstr "Marata�"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 #, fuzzy
 msgid "Marte"
 msgstr "D�ta"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marthas Vineyard"
 msgstr ""
 
 # mr
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Marata�"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsville"
 msgstr ""
 
 # EI
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Maryland"
 msgstr "�ire"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr ""
 
 # mr
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 #, fuzzy
 msgid "Masirah"
 msgstr "Marata�"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 #, fuzzy
 msgid "Massena"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Matamoros"
 msgstr ""
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 #, fuzzy
 msgid "Mattoon"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Bainisteoir"
 
 # ms
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayport"
 msgstr "Malaeis"
 
 # MT
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mazatlan"
 msgstr "M�lta"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 #, fuzzy
 msgid "McAllen"
 msgstr "Gach Rud"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 #, fuzzy
 msgid "McCall"
 msgstr "Post"
 
 # mr
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCarthy"
 msgstr "Marata�"
 
 # IS
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McClellan"
 msgstr "An �oslainn"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McComb"
 msgstr "Teor."
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr ""
 
 # mr
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 #, fuzzy
 msgid "Meacham"
 msgstr "Marata�"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Medford"
 msgstr "riomh"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 #, fuzzy
 msgid "Mehamn"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr ""
 
 # MT
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 #, fuzzy
 msgid "Melfa"
 msgstr "M�lta"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 #, fuzzy
 msgid "Mendoza"
 msgstr "Luain"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 #, fuzzy
 msgid "Merida"
 msgstr "Aoine"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr ""
 
 # MX
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 #, fuzzy
 msgid "Mexicali"
 msgstr "Meicsiceo"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 #, fuzzy
 msgid "Miami"
 msgstr "Post"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 #, fuzzy
 msgid "Middle East"
 msgstr "_M�an:"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middletown"
 msgstr "_M�an:"
 
 # FI
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Midland"
 msgstr "An Fhionlainn"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 #, fuzzy
 msgid "Miles City"
 msgstr "Cin�al Comhad:"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Milford"
 msgstr ""
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 #, fuzzy
 msgid "Milton"
 msgstr "Post do %s"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minatitlan"
 msgstr ""
 
 # fr 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minchumina"
 msgstr "Fraincis"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 #, fuzzy
 msgid "Minnesota"
 msgstr "Noimea�d"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 #, fuzzy
 msgid "Minot"
 msgstr "Noimea�d"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missouri"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Mitchell"
 msgstr ""
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 #, fuzzy
 msgid "Moa"
 msgstr "Lu"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "F�n Ph�ca"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 #, fuzzy
 msgid "Mobridge"
 msgstr "G�than P�ca"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Modesto"
 msgstr ""
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 #, fuzzy
 msgid "Mojave"
 msgstr "Bog"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Molde"
 msgstr "G�than P�ca"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Moldova"
 msgstr "Luain"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr ""
 
 # MW
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 #, fuzzy
 msgid "Molokai"
 msgstr "Malawi"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr ""
 
 # MC
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 #, fuzzy
 msgid "Monclova"
 msgstr "Monac�"
 
 # MC
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Moncton"
 msgstr "Monac�"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Monida"
 msgstr "Luain"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
 # MC
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 #, fuzzy
 msgid "Monroe"
 msgstr "Monac�"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Montague"
 msgstr "Bainisteoir"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montana"
 msgstr "M�"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Radharc M�"
 
 # MN
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Montego Bay"
 msgstr "An Mh�ng�il"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 #, fuzzy
 msgid "Monterey"
 msgstr "M�"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterrey"
 msgstr "Idirbhr�ste"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
 # MC
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 #, fuzzy
 msgid "Monticello"
 msgstr "Monac�"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Montpelier"
 msgstr "Radharc M�"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 #, fuzzy
 msgid "Montrose"
 msgstr "Chl�fhoireanna"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr ""
 
 # MN
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 #, fuzzy
 msgid "Morelia"
 msgstr "An Mh�ng�il"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morgantown"
 msgstr "Eagr�"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Moriarty"
 msgstr "Tosa�ocht"
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 #, fuzzy
 msgid "Mosinee"
 msgstr "G�than P�ca"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 #, fuzzy
 msgid "Mountain View"
 msgstr "Radharc M�"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Radharc M�"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 #, fuzzy
 msgid "Mullan"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr ""
 
 # GN
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 #, fuzzy
 msgid "Muncie"
 msgstr "An Ghuine"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr ""
 
 # AT
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 #, fuzzy
 msgid "Murcia"
 msgstr "An Ostair"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 #, fuzzy
 msgid "Mus"
 msgstr "GN"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr ""
 
 # MC
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 #, fuzzy
 msgid "Mykonos"
 msgstr "Monac�"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 #, fuzzy
 msgid "Namsos"
 msgstr "Ainm"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 #, fuzzy
 msgid "Nanning"
 msgstr "Rabhadh"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr ""
 
 # NP
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 #, fuzzy
 msgid "Napa"
 msgstr "Neipe�l"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Naples"
 msgstr "Nuacht"
 
 # ML
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Napoli"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Narvik"
 msgstr "L.ainm."
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr ""
 
 # NP
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 #, fuzzy
 msgid "Natal"
 msgstr "Neipe�l"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natchez"
 msgstr ""
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 #, fuzzy
 msgid "Nebraska"
 msgstr "Teasc Nua"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Nenana"
 msgstr ""
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Nevada"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Newark"
 msgstr "Teasc Nua"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "New Bedford"
 msgstr "Bealach Nuacht�in"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bern"
 msgstr "Fillte�n _Nua"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 #, fuzzy
 msgid "Newcastle"
 msgstr "Nuacht"
 
 # NZ
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "An Nua-Sh�alainn"
 
 # NZ
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "Newfoundland"
 msgstr "An Nua-Sh�alainn"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 #, fuzzy
 msgid "New Haven"
 msgstr "Sce�l Nua"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Iberia"
 msgstr ""
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Jersey"
 msgstr "Sce�l Nua"
 
 # MX
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Mexico"
 msgstr "Meicsiceo"
 
 # NZ
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Orleans"
 msgstr "An Nua-Sh�alainn"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 #, fuzzy
 msgid "Newport"
 msgstr "Tuaisceart"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 #, fuzzy
 msgid "New River"
 msgstr "Fillte�n _Nua"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 #, fuzzy
 msgid "Newton"
 msgstr "_Nua"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "New York"
 msgstr "Fillte�n _Nua"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Nimes-Garons"
 msgstr ""
 
 # ES
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nipawin"
 msgstr "An Sp�inn"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nis"
 msgstr ""
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 #, fuzzy
 msgid "Nogales"
 msgstr "Gn�th"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nome"
 msgstr "Ainm"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Norfolk"
 msgstr "Gn�th"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 #, fuzzy
 msgid "Norrkoping"
 msgstr "Ag Obair"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "North Adams"
 msgstr "Tuaisceart"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Bend"
 msgstr "Tuaisceart"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr ""
 
 # NO
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 #, fuzzy
 msgid "North Conway"
 msgstr "An Iorua"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Dakota"
 msgstr "Data Breithe"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 #, fuzzy
 msgid "North Platte"
 msgstr "Data Breithe"
 
 # NO
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "Northway"
 msgstr "An Iorua"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "_Nota�:"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norwich"
 msgstr "Tuaisceart"
 
 # NO
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwood"
 msgstr "An Iorua"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Notodden"
 msgstr "Nota"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "Gan carta�"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr ""
 
 # TH
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 #, fuzzy
 msgid "Oakland"
 msgstr "An T�alainn"
 
 # JM
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Iam�ice"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
 msgstr ""
 
 # MT
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 #, fuzzy
 msgid "Ocala"
 msgstr "M�lta"
 
 # IS
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Oceanside"
 msgstr "An �oslainn"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Odense"
 msgstr "Aon"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Oelwen"
 msgstr "Osc�il"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Ogden"
 msgstr "Osc�il"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 #, fuzzy
 msgid "Ohrid"
 msgstr "Eile"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Olathe"
 msgstr "Eile"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr ""
 
 # AL
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 #, fuzzy
 msgid "Olbia"
 msgstr "An Alb�in"
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 #, fuzzy
 msgid "Omak"
 msgstr "Ceart go Leor"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 #, fuzzy
 msgid "Omsk"
 msgstr "Ceart go Leor"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 #, fuzzy
 msgid "Ontario"
 msgstr "Treoshu�omh"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Oostende"
 msgstr ""
 
 # ko
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oran"
 msgstr "Coir�is"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr ""
 
 # FR
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 #, fuzzy
 msgid "Orange"
 msgstr "An Fhrainc"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 #, fuzzy
 msgid "Oregon"
 msgstr "Eag."
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr ""
 
 # EI
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 #, fuzzy
 msgid "Orland"
 msgstr "�ire"
 
 # EI
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orlando"
 msgstr "�ire"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 #, fuzzy
 msgid "Oruro"
 msgstr "Earraidh"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 #, fuzzy
 msgid "Oscoda"
 msgstr "soic�nd"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
 # AU
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 #, fuzzy
 msgid "Ostrava"
 msgstr "An Astr�il"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 #, fuzzy
 msgid "Owyhee"
 msgstr "seachtain"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Oxford"
 msgstr ""
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 #, fuzzy
 msgid "Paganella"
 msgstr "Leathanach"
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 #, fuzzy
 msgid "Palermo"
 msgstr "P�ip�ir"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 #, fuzzy
 msgid "Palmer"
 msgstr "Pager"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palm Springs"
 msgstr "Albachta� Phoist"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama City"
 msgstr ""
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Ceangailte"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Papa"
 msgstr "P�ip�ir"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 #, fuzzy
 msgid "Paris"
 msgstr "Tos."
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr ""
 
 # ca 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "Catal�inis"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 #, fuzzy
 msgid "Pasco"
 msgstr "Pasfhocal"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr ""
 
 # PK
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 #, fuzzy
 msgid "Patna"
 msgstr "An Phacast�in"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr ""
 
 # PK
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 #, fuzzy
 msgid "Paysandu"
 msgstr "An Phacast�in"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Payson"
 msgstr "Lae"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Pellston"
 msgstr "Freagra"
 
 # IS
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pelotas"
 msgstr "An �oslainn"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pendleton"
 msgstr "Fillte�n _Nua"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 #, fuzzy
 msgid "Peoria"
 msgstr "Tosa�ocht"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 #, fuzzy
 msgid "Perm"
 msgstr "Tos."
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr ""
 
 # PE
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 #, fuzzy
 msgid "Perth"
 msgstr "Peiri�"
 
 # PE
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 #, fuzzy
 msgid "Perugia"
 msgstr "Peiri�"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr ""
 
 # PH FIXME
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 #, fuzzy
 msgid "Philip"
 msgstr "Na hOile�in"
 
 # PH FIXME
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Na hOile�in"
 
 # PH FIXME
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Phillips"
 msgstr "Na hOile�in"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr ""
 
 # PS
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 #, fuzzy
 msgid "Pierre"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 #, fuzzy
 msgid "Pikeville"
 msgstr "Reamhthaispe�intas"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr ""
 
 # PK
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 #, fuzzy
 msgid "Pisa"
 msgstr "An Phacast�in"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 #, fuzzy
 msgid "Plymouth"
 msgstr "m�"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Point Hope"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Lay"
 msgstr "Coimiri� Pr�ont"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Post an sce�l seo"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 #, fuzzy
 msgid "Poitiers"
 msgstr "�lbacta�"
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponce"
 msgstr "Cr�ochnaithe"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 #, fuzzy
 msgid "Pontiac"
 msgstr "_Tadhall"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr ""
 
 # PL
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 #, fuzzy
 msgid "Poprad"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Priont�il Feilire"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr ""
 
 # PT
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 #, fuzzy
 msgid "Port Angeles"
 msgstr "An Phortaing�il"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 #, fuzzy
 msgid "Porterville"
 msgstr "Reamhthaispe�intas"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Priont�il carta"
 
 # PL
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hedland"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr ""
 
 # PL
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 #, fuzzy
 msgid "Portland"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Porto"
 msgstr "_Poirt:"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto Alegre"
 msgstr ""
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 #, fuzzy
 msgid "Portoroz"
 msgstr "Portr�id"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Portr�id"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 #, fuzzy
 msgid "Port Said"
 msgstr "Portr�id"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr ""
 
 # PL
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 #, fuzzy
 msgid "Posadas"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr ""
 
 # CR
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 #, fuzzy
 msgid "Poza Rica"
 msgstr "C�sta Rice"
 
 # PL
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poznan"
 msgstr "An Pholainn"
 
 # PY
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Praha"
 msgstr "Paraguay"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Priont�il Reamhtaispe�ntais"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 #, fuzzy
 msgid "Pretoria"
 msgstr "Portr�id"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Preveza"
 msgstr "Reamhthaispe�intas"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Price-Carbon"
 msgstr ""
 
 # PK
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Pristina"
 msgstr "An Phacast�in"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Providence"
 msgstr ""
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Provincetown"
 msgstr "Reamhthaispe�intas"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provo"
 msgstr "Dea."
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr ""
 
 # CU
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 #, fuzzy
 msgid "Puebla"
 msgstr "C�ba"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Freagra"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "Coimiri� Pr�ont"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr ""
 
 # PL
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 #, fuzzy
 msgid "Pula"
 msgstr "An Pholainn"
 
 # PL
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pullman"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Priont�il Feilire"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 #, fuzzy
 msgid "Quantico"
 msgstr "Freagra"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quebec"
 msgstr "Abair"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 #, fuzzy
 msgid "Rawlins"
 msgstr "B�isteach"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Reading"
 msgstr "B�isteach"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Recife"
 msgstr "Dealaigh"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Redding"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redig"
 msgstr "Raidio"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redmond"
 msgstr "Scr�os"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 #, fuzzy
 msgid "Regina"
 msgstr "B�isteach"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Rennes"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Reno"
 msgstr "Post"
 
 # LB
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Renton"
 msgstr "An Liob�in"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 #, fuzzy
 msgid "Reus"
 msgstr "Post"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reyes"
 msgstr "Freagrair"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr ""
 
 # IS
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 #, fuzzy
 msgid "Reynosa"
 msgstr "An �oslainn"
 
 # FI
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Rhinelander"
 msgstr "An Fhionlainn"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "Leasainm"
 
 # HT
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rieti"
 msgstr "H��t�"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rifle"
 msgstr "_Comhad"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rijeka"
 msgstr ""
 
 # RO 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rimini"
 msgstr "An R�m�in"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
 #, fuzzy
 msgid "Rioja"
 msgstr "Raidio"
 
 # NI 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "Nicaragua"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr ""
 
 # NG
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
 #, fuzzy
 msgid "Rivera"
 msgstr "An Nig�ir"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
 #, fuzzy
 msgid "Rivne"
 msgstr "B�isteach"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 msgid "Riyadh"
 msgstr ""
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr ""
 
 # RO 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
 #, fuzzy
 msgid "Roatan"
 msgstr "An R�m�in"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Robore"
 msgstr "riomh"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr ""
 
 # PL
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
 #, fuzzy
 msgid "Rockland"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
 #, fuzzy
 msgid "Rodos"
 msgstr "Seomra"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rogers"
 msgstr "Fillte�in"
 
 # RO 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "An R�m�in"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
 #, fuzzy
 msgid "Roros"
 msgstr "Seomra"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
 #, fuzzy
 msgid "Rosario"
 msgstr "Raidio"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
 msgid "Roseglen"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Rost"
 msgstr "�st"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr ""
 
 # AT
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 #, fuzzy
 msgid "Russia"
 msgstr "An Ostair"
 
 # PL
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Rutland"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
 #, fuzzy
 msgid "Sacramento"
 msgstr "iat�n"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
 msgstr ""
 
 # ES
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
 #, fuzzy
 msgid "Saginaw"
 msgstr "An Sp�inn"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "Priont�il Carta�"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saiq"
 msgstr "Sa"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Salem"
 msgstr "S�bh�il"
 
 # ML
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salida"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr ""
 
 # ES
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
 #, fuzzy
 msgid "Salina"
 msgstr "An Sp�inn"
 
 # ES
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salinas"
 msgstr "An Sp�inn"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
 msgid "Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr ""
 
 # MT
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
 #, fuzzy
 msgid "Salta"
 msgstr "M�lta"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr ""
 
 # st
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
 #, fuzzy
 msgid "Salto"
 msgstr "Stad"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr ""
 
 # SV
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
 #, fuzzy
 msgid "Salvador"
 msgstr "An tSalvad�ir"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr ""
 
 # JM
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
 #, fuzzy
 msgid "Samara"
 msgstr "Iam�ice"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 msgid "Samos"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samsun"
 msgstr "_Dom"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
 #, fuzzy
 msgid "San Carlos"
 msgstr "S�bh�il agus D�n"
 
 # SD
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "Sandane"
 msgstr "An tS�d�in"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 msgid "Sandberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 msgid "Sanderson"
 msgstr ""
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
 msgid "Sanford"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 msgid "Sangju"
 msgstr ""
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Jose"
 msgstr "S�bh�il agus D�n"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr ""
 
 # SD
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
 #, fuzzy
 msgid "San Juan"
 msgstr "An tS�d�in"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
 msgid "Sanliurfa"
 msgstr ""
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 msgid "San Nicholas Island"
 msgstr ""
 
 # SV
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 #, fuzzy
 msgid "San Salvador"
 msgstr "An tSalvad�ir"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santander"
 msgstr "Bainisteoir"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
 msgid "Santorini"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santos"
 msgstr "St�das"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
 msgid "Sarasota"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr ""
 
 # LK
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
 #, fuzzy
 msgid "Sarzana"
 msgstr "Sr� Lanca"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
 #, fuzzy
 msgid "Sayun"
 msgstr "_Dom"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Scatsta"
 msgstr "St�das"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
 #, fuzzy
 msgid "Scranton"
 msgstr "Eagr�"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "�lbachta�"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Sedalia"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Seeb"
 msgstr "M. F�mhair"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
 #, fuzzy
 msgid "Seward"
 msgstr "Cuardaigh"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr ""
 
 # GH
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
 #, fuzzy
 msgid "Shanghai"
 msgstr "G�na"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
 #, fuzzy
 msgid "Sharjah"
 msgstr "Cuardaigh"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
 #, fuzzy
 msgid "Sharurah"
 msgstr "Sathairn"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Shawbury"
 msgstr "Sathairn"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr ""
 
 # SE
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
 #, fuzzy
 msgid "Sheldon"
 msgstr "An tSualainn"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
 #, fuzzy
 msgid "Shelton"
 msgstr "Fillte�n _Nua"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr ""
 
 # SD
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
 #, fuzzy
 msgid "Sheridan"
 msgstr "An tS�d�in"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
 #, fuzzy
 msgid "Shiraz"
 msgstr "M�id"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr ""
 
 # Avoid; either use KR or KP
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
 #, fuzzy
 msgid "Shoreham"
 msgstr "Sc�r"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Show Low"
 msgstr "Taispe�n aon seachtain"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
 #, fuzzy
 msgid "Sidney"
 msgstr "M�id"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
 #, fuzzy
 msgid "Silver City"
 msgstr "Sl�nd�il"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
 #, fuzzy
 msgid "Skive"
 msgstr "S�bh�il"
 
 # st
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skopje"
 msgstr "Stad"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 msgid "Skwentna"
 msgstr ""
 
 # AL
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Slana"
 msgstr "An Alb�in"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 #, fuzzy
 msgid "Smithers"
 msgstr "Taispe�in"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Sochi"
 msgstr "Deisceart"
 
 # Avoid; either use KR or KP
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Socorro"
 msgstr "Sc�r"
 
 # Avoid; either use KR or KP
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socotra"
 msgstr "Sc�r"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 msgid "Sofia"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Somerset"
 msgstr "Taispe�in"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 msgid "Sonderborg"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
 #, fuzzy
 msgid "Southampton"
 msgstr "Deisceart"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "South Bend"
 msgstr "Deisceart"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 msgid "South Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "Southend"
 msgstr "Deisceart"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
 #, fuzzy
 msgid "Spencer"
 msgstr "M. F�mhair"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
 #, fuzzy
 msgid "Split"
 msgstr "l�osta"
 
 # ES
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Spokane"
 msgstr "An Sp�inn"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
 #, fuzzy
 msgid "Springfield"
 msgstr "Ag stoir filtean"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "Stauning"
 msgstr "Rabhadh"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
 #, fuzzy
 msgid "Staverton"
 msgstr "S�bh�il"
 
 # st
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Stavropol"
 msgstr "Stad"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr ""
 
 # st
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
 #, fuzzy
 msgid "St Joseph"
 msgstr "Stad"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 msgid "St Louis"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr ""
 
 # LK
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Sr� Lanca"
 
 # NO
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Stornoway"
 msgstr "An Iorua"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "St Paul"
 msgstr "St�das"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "Sathairn"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr ""
 
 # Avoid; either use KR or KP
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
 #, fuzzy
 msgid "Sucre"
 msgstr "Sc�r"
 
 # LU
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Lucsamburg"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumter"
 msgstr "Coimri�"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr ""
 
 # st
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
 #, fuzzy
 msgid "Sutton"
 msgstr "Stad"
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
 msgid "Tabatinga"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr ""
 
 # tg
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 #, fuzzy
 msgid "Tabuk"
 msgstr "T�ids�cis"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr ""
 
 # GH
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
 #, fuzzy
 msgid "Tacna"
 msgstr "G�na"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
 msgid "Taejon"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
 msgid "Taif"
 msgstr ""
 
 # TH
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Tainan"
 msgstr "An T�alainn"
 
 # TH
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 #, fuzzy
 msgid "Taiyuan"
 msgstr "An T�alainn"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Tajima"
 msgstr "Am"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
 #, fuzzy
 msgid "Tallinn"
 msgstr "B�isteach"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
 # JP
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
 #, fuzzy
 msgid "Tampa"
 msgstr "An tSeap�in"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
 #, fuzzy
 msgid "Tampere"
 msgstr "P�ip�ir"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr ""
 
 # CA
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
 #, fuzzy
 msgid "Tanana"
 msgstr "Ceanada"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr ""
 
 # tg
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
 #, fuzzy
 msgid "Taos"
 msgstr "T�ids�cis"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
 msgid "Taranto"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Tarbes"
 msgstr "An Tib�id"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
 msgid "Tatalina"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
 #, fuzzy
 msgid "Tela"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Temple"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
 #, fuzzy
 msgid "Texas"
 msgstr "An Tib�id"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
 #, fuzzy
 msgid "Thisted"
 msgstr "Teideal"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
 #, fuzzy
 msgid "Thumrait"
 msgstr "Deardaoin"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 msgid "Tianjin"
 msgstr ""
 
 # GY
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tijuana"
 msgstr "An Ghu�in"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
 msgid "Tirana"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tiree"
 msgstr "Am"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
 #, fuzzy
 msgid "Titusville"
 msgstr "Teideal"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Tivat"
 msgstr "Priobhdach"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
 msgid "Toledo"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 msgid "Tonopah"
 msgstr ""
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Topeka"
 msgstr "Saghas"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
 #, fuzzy
 msgid "Torp"
 msgstr "Thar:"
 
 # FR
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torrance"
 msgstr "An Fhrainc"
 
 # ko
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torreon"
 msgstr "Coir�is"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 msgid "Tottori Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Toulouse"
 msgstr "D�n"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
 msgid "Trabzon"
 msgstr ""
 
 # JP
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trapani"
 msgstr "An tSeap�in"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
 #, fuzzy
 msgid "Trelew"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trenton"
 msgstr "Treoshu�omh"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trevico"
 msgstr "Riomh"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
 #, fuzzy
 msgid "Trieste"
 msgstr "An Tib�id"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr ""
 
 # TR
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
 #, fuzzy
 msgid "Truckee"
 msgstr "An Tuirc"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
 #, fuzzy
 msgid "Tulcea"
 msgstr "Mairt"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulsa"
 msgstr "Mairt"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tupelo"
 msgstr "Saghas"
 
 # tr
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Turaif"
 msgstr "Tuircis"
 
 # tr
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turin"
 msgstr "Tuircis"
 
 # TR
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 #, fuzzy
 msgid "Turku"
 msgstr "An Tuirc"
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
 #, fuzzy
 msgid "Tyler"
 msgstr "bliain"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
 #, fuzzy
 msgid "Tyumen"
 msgstr "Saghas"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr ""
 
 # AR
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "Aontas na n�im�r�ochta� Arabacha"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr ""
 
 # JP
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
 #, fuzzy
 msgid "Uruapan"
 msgstr "An tSeap�in"
 
 # UY
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Uragua"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
 msgid "Utah"
 msgstr ""
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 #, fuzzy
 msgid "Vadso"
 msgstr "Raidio"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Luaineach"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vagar"
 msgstr "Pager"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr ""
 
 # MT
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 #, fuzzy
 msgid "Valdosta"
 msgstr "M�lta"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
 #, fuzzy
 msgid "Valencia"
 msgstr "Feilire"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
 #, fuzzy
 msgid "Van"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr ""
 
 # FR
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 #, fuzzy
 msgid "Vandel"
 msgstr "An Fhrainc"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
 #, fuzzy
 msgid "Varadero"
 msgstr "Luaineach"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
 #, fuzzy
 msgid "Varna"
 msgstr "Luaineach"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Vasteras"
 msgstr "Greamaigh"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr ""
 
 # VE
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
 #, fuzzy
 msgid "Venezia"
 msgstr "Veinis�ala"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 #, fuzzy
 msgid "Venice"
 msgstr "Uinc�d"
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 #, fuzzy
 msgid "Vermont"
 msgstr "m�"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vernal"
 msgstr "Gn�th"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr ""
 
 # VE
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
 #, fuzzy
 msgid "Vicenza"
 msgstr "Veinis�ala"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
 #, fuzzy
 msgid "Vilhena"
 msgstr "Ainm Chomad:"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr ""
 
 # AU
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
 #, fuzzy
 msgid "Visalia"
 msgstr "An Astr�il"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr ""
 
 # EI
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
 #, fuzzy
 msgid "Vlieland"
 msgstr "�ire"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 msgid "Volkel"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
 msgid "Voslau"
 msgstr ""
 
 # MC
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 #, fuzzy
 msgid "Waco"
 msgstr "Monac�"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
 #, fuzzy
 msgid "Warner Robins"
 msgstr "Rabhadh"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 #, fuzzy
 msgid "Waterbury"
 msgstr "Aimsir"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterloo"
 msgstr "Aimsir"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Watertown"
 msgstr "Aimsir"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 msgid "Waterville"
 msgstr ""
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
 #, fuzzy
 msgid "Webster City"
 msgstr "Idirl�on"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Wejh"
 msgstr "Ce"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Aimsir"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 msgid "Wendover"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
 msgid "West Burke"
 msgstr ""
 
 # NL
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "Westerland"
 msgstr "An Isiltir"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westfield"
 msgstr "Iarthair"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
 msgid "Wheeling"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
 #, fuzzy
 msgid "Wick"
 msgstr "L.ainm."
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wien"
 msgstr "Ce"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
 #, fuzzy
 msgid "Williston"
 msgstr "l�osta"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 #, fuzzy
 msgid "Winslow"
 msgstr "anois"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
 #, fuzzy
 msgid "Winter Park"
 msgstr "Pasfhocal, le do thoil"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
 #, fuzzy
 msgid "Wisconsin"
 msgstr "soicind"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
 #, fuzzy
 msgid "Wise"
 msgstr "Ce"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Wooster"
 msgstr "Scr�obh�ir"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Worcester"
 msgstr "Aimsir"
 
 # PL
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worland"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worthington"
 msgstr "Ag Obair"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
 #, fuzzy
 msgid "Wyoming"
 msgstr "Ag Obair"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Xiamen"
 msgstr "Am"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
 #, fuzzy
 msgid "Yenbo"
 msgstr "Imbosca"
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
 #, fuzzy
 msgid "Zadar"
 msgstr "Feilire"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zagreb"
 msgstr "Leathanach"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
 #, fuzzy
 msgid "Zanesville"
 msgstr "Ceangailte"
 
 # PY
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zaragoza"
 msgstr "Paraguay"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr ""
 
 # tr
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
 #, fuzzy
 msgid "Zurich"
 msgstr "Tuircis"
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "Coinn�"
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Gan coinn�"
 
-#: my-evolution/e-summary-calendar.c:418
+#: my-evolution/e-summary-calendar.c:405
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:420
-msgid "%l:%M %d %B"
+#: my-evolution/e-summary-calendar.c:407
+#, fuzzy
+msgid "%l:%M%P %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:438
+#: my-evolution/e-summary-calendar.c:425
 #, fuzzy
 msgid "No description"
 msgstr "(Gan Tuarascail)"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Coimri� phoist"
 
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1102
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
 #, fuzzy
 msgid "Local Folders"
 msgstr "_Fillte�n"
 
-#. translators: Put a list of codes for locations you want to see in
-#. My Evolution by default here. You can find the list of all
-#. stations and their codes in Evolution sources.
-#. (evolution/my-evolution/Locations)
-#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:591
-msgid "KBOS"
-msgstr "KBOS"
-
-#: my-evolution/e-summary-preferences.c:584
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Focal do Lae"
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:848
+#: my-evolution/e-summary-preferences.c:621
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Bealach Nuacht�in"
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 #, fuzzy
 msgid "All"
 msgstr "Gach Rud"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 #, fuzzy
 msgid "Add"
 msgstr "_Suimigh"
 
 # SE
-#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "An tSualainn"
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Gan Teascanna"
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(Gan Tuarascail)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr "Aimsir"
 
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Aimsir"
 
-#: my-evolution/e-summary.c:188
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:584
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 #, fuzzy
 msgid "Please wait..."
 msgstr "F�n le do thoil"
 
-#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Coimiri� Pr�ont"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr ""
-
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 #, fuzzy
 msgid " F"
 msgstr ", "
 
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 #, fuzzy
 msgid " C"
 msgstr ", "
 
 # MC
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 #, fuzzy
 msgid "knots"
 msgstr "Monac�"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr "kph"
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "inHg"
 msgstr "inHg"
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "mmHg"
 msgstr "mmHg"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "miles"
 msgstr "m�le"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr "km"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "Geal"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr ""
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "Scamaill Scaipthe"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "Beag�n Scamallach"
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr "Dorcha"
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
 msgid "Invalid"
 msgstr ""
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "Luaineach"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "Tuaisceart"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "Deisceart"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "Deisceart - "
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "Iarthair"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr ""
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr "Taispe�in"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "B�isteach"
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr ""
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "Sneachta"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr ""
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 #, fuzzy
 msgid "Shallow hail"
 msgstr "Taispe�n gach Rud"
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr ""
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr ""
 
 # so
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr ""
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 #, fuzzy
 msgid "Unknown thunderstorm"
 msgstr "iEarraidh gan Aithne"
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr ""
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr ""
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr ""
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr ""
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr ""
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr ""
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr ""
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 #, fuzzy
 msgid "Smoke with wind"
 msgstr "D�n an fhuinneog seo"
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 msgid "Showers of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr ""
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr ""
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 msgid "Spray"
 msgstr ""
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 msgid "Light spray"
 msgstr ""
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 msgid "Moderate spray"
 msgstr ""
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 msgid "Heavy spray"
 msgstr ""
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 #, fuzzy
 msgid "Shallow spray"
 msgstr "Taispe�n gach Rud"
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
 msgstr ""
 
 # ca 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 #, fuzzy
 msgid "Partial spray"
 msgstr "Catal�inis"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
 msgstr ""
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 msgid "Freezing spray"
 msgstr "Post"
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr ""
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
+#: my-evolution/metar.c:443 my-evolution/metar.c:452
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:443
+#: my-evolution/metar.c:444
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -26231,90 +26545,76 @@ msgstr ""
 msgid "_Weather"
 msgstr "_Aimsir"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 #, fuzzy
-msgid "Folder Settings"
-msgstr "Albachta� Phoist"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-#, fuzzy
-msgid "The Evolution shell."
+msgid "Evolution Shell"
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/e-activity-handler.c:162
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Albachta� Phoist"
+
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Taisp�an Sonra�"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
 "%s"
 msgstr "Te�p ag fork: %s"
 
-#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, fuzzy, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "Osc�il san %s..."
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 #, fuzzy
 msgid "Add a Folder"
 msgstr "Fillte�n _Nua"
 
 # DE
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Drafts"
 msgstr "An Ghearm�in"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
-#: shell/e-shortcuts.c:1055
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Imbosca"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Asbosca"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 #, fuzzy
 msgid "Sent"
 msgstr "Post"
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr ""
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -26322,38 +26622,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:282
-#, fuzzy, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr "Te�p ag fork: %s"
-
-#: shell/e-setup.c:300
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:306
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:329
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -26361,16 +26637,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:343
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -26382,27 +26649,27 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
 msgstr "_Fillte�n"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "_Fillte�in Speis�alta"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
 msgstr "_Fillte�in Speis�alta"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "_Fillte�in Speis�alta"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 #, fuzzy
 msgid "Autocompletion Folders"
 msgstr "_Fillte�n"
@@ -26412,117 +26679,113 @@ msgstr "_Fillte�n"
 msgid "Cannot copy folder: %s"
 msgstr "Te�p ag fork: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, fuzzy, c-format
 msgid "Cannot move folder: %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:204
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:321
+#: shell/e-shell-folder-commands.c:319
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "C�ip Fillte�n"
 
-#: shell/e-shell-folder-commands.c:365
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:406
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Dealaigh \"%s\""
-
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Dealaigh Fillte�n '%s'"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Dealaigh \"%s\""
+
+#: shell/e-shell-folder-commands.c:485
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 #, fuzzy
 msgid "Rename folder"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:165
+#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-creation-dialog.c:170
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:586
+#: shell/e-shell-folder-commands.c:583
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:586
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
 "%s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-creation-dialog.c:122
+#: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Fillte�n _Nua"
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "Nua..."
-
-#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(gan tide�l)"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -26531,124 +26794,124 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "Fillte�n _Nua"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:552
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution "
 
-#: shell/e-shell-importer.c:504
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Ainm Chomad:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "T�g Comhad"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Cin�al Comhad:"
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "� %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "T�g Fillte�n"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, fuzzy, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -26657,153 +26920,153 @@ msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %s\n"
 " %s"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 #, fuzzy
 msgid "Syncing Folder"
 msgstr "ag sioncronaich filtean"
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:317
+#: shell/e-shell-offline-sync.c:311
 #, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:345
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:357
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+msgid "Please select a user."
+msgstr ""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Osc�il san %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:455
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Te�p ag fork: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:513
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:159
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr ""
-
-#: shell/e-shell-user-creatable-items-handler.c:579
-#: shell/e-shell-user-creatable-items-handler.c:633
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:636
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr "_Nua"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr ""
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr ""
 
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
+#: shell/e-shell-utils.c:129
+msgid "Folder name cannot contain the character \"/\"."
+msgstr ""
+
+#: shell/e-shell-utils.c:135
+msgid "Folder name cannot contain the character \"#\"."
 msgstr ""
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:94
+#: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
+#: shell/e-shell-view-menu.c:193
+msgid "Bug buddy is not installed."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Faoi Evolution..."
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Scr�os an sceal seo"
 
-#: shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:618
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "Sheoladh Chuig duine"
 
-#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1861
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1863
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(Ar Bith)"
 
-#: shell/e-shell-view.c:1910
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1917
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1923
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26816,12 +27079,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26829,151 +27092,145 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Ainm Grupa:"
 
-#: shell/e-shortcuts-view.c:173
+#: shell/e-shortcuts-view.c:179
 #, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create _Default Shortcuts"
 msgstr "Scr�os an sceal seo"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 #, fuzzy
 msgid "Create Default Shortcuts"
 msgstr "Scr�os an sceal seo"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:410
+#: shell/e-shortcuts-view.c:417
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Post an sce�l seo"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "_Scr�os"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr ""
 
@@ -26983,74 +27240,74 @@ msgstr ""
 msgid "Checkbox"
 msgstr "T�alainnis"
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Gan Earraidh"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "Earraidh I/A"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Te�p ag fork: %s"
 
-#: shell/e-storage.c:599
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-task-widget.c:191
+#: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:196
+#: shell/e-task-widget.c:216
 #, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% Rinneadh:"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -27080,84 +27337,81 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "Earraidh CORBA"
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Idirbhr�ste"
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Gan �in�ar"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Earraidh Intire"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Post an sce�l seo"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test type"
 msgstr "Cin�al Comhad:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr ""
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Alairm Evolution"
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "�st"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr ""
 
@@ -27184,15 +27438,15 @@ msgstr "_Post"
 msgid "_Tasks:"
 msgstr "Teascanna"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Ainm Fillte�n:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "Saghas Fillte�n:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
@@ -27216,37 +27470,37 @@ msgstr "Ainm Fillte�n:"
 msgid "_User:"
 msgstr "Ainm _�saideoir"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Am Cr�os "
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "F�ilte"
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 
 #: shell/importer/import.glade.h:1
@@ -27280,41 +27534,42 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr ""
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr ""
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:102
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:227
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:266
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -27324,7 +27579,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:250
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -27332,73 +27587,107 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:259
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:394
+#: shell/main.c:387
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:485
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:487
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:491
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr ""
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:493
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:542
-msgid "Cannot initialize the Bonobo component system."
-msgstr ""
-
-#: tools/evolution-addressbook-abuse.c:80
-#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-abuse.c:81
 #: tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
 msgstr "Eagar Leabhar Sheoladh"
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Comhad Inchur"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Comhad Aschur"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr ""
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "iat�n"
+
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:327
+#, fuzzy
+msgid "Description of the attachment."
+msgstr "_Coinne"
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:329
+msgid "Default subject for the message."
+msgstr ""
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "Te�p ag fork: %s"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:3
 #, fuzzy
 msgid "Copy Contact(s) to Another Folder..."
@@ -27495,7 +27784,7 @@ msgstr ""
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr ""
 
@@ -27616,7 +27905,7 @@ msgid "Print this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "S�bh�il"
 
@@ -27643,7 +27932,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Comhad"
 
@@ -27901,7 +28190,7 @@ msgstr "Post an sce�l seo"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Fillte�n"
 
@@ -28178,7 +28467,7 @@ msgstr "Freagrair"
 
 #: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Post a reply to a message message in a Public folder"
+msgid "Post a reply to a message in a Public folder"
 msgstr "Fillte�n _Nua"
 
 #: ui/evolution-mail-message.xml.h:64
@@ -28349,7 +28638,7 @@ msgstr "Sheoladh Chuig duine"
 msgid "_Resend..."
 msgstr "_Osc�il..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Uirlis�"
 
@@ -28364,12 +28653,12 @@ msgstr "D�n an fhuinneog seo"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Close"
 msgstr "_D�n"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "_Radharc"
 
@@ -28377,6 +28666,10 @@ msgstr "_Radharc"
 msgid "Attach"
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr ""
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr ""
@@ -28550,7 +28843,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr "C_�idi�"
 
@@ -28739,128 +29032,118 @@ msgstr "Albachta� Phoist"
 
 #: ui/evolution.xml.h:27
 #, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "Albachta� Phoist"
-
-#: ui/evolution.xml.h:28
-#, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "Socr� Post"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Socr� Post"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "_Faoi Ximian Evolution..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_C�ip..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Fillte�n"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Import..."
 msgstr "Chl�_fhoireann..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Bog..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Nua"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Faoi..."
@@ -28951,9 +29234,8 @@ msgstr "_Saghas:"
 msgid "_Tasks"
 msgstr "_Teasc"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr ""
 
@@ -28979,21 +29261,21 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr ""
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:357
+#: widgets/menus/gal-view-menus.c:350
 #, fuzzy
 msgid "Custom View"
 msgstr "Radharc Carta"
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr ""
 
@@ -29004,19 +29286,19 @@ msgid "MTWTFSS"
 msgstr "LMCDASD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1070
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "Anois"
 
-#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr "Inni�"
 
-#: widgets/misc/e-cell-date-edit.c:797
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -29026,89 +29308,89 @@ msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
 # bn 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 #, fuzzy
 msgid "Baltic"
 msgstr "Beang�la�"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr ""
 
 # zh
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "S�nis"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr ""
 
 # el 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Gr�igis"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr ""
 
 # ja
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Seap�inis"
 
 # ko
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Coir�is"
 
 # tr
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Tuircis"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Uinc�d"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr ""
 
 # uk
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 #, fuzzy
 msgid "Ukrainian"
 msgstr "�cr�inis"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 #, fuzzy
 msgid "Visual"
 msgstr "M�chumasach"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, fuzzy, c-format
 msgid "Unknown character set: %s"
 msgstr "Earraidh gan aithne: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Eile..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr ""
 
@@ -29116,11 +29398,12 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr ""
 
@@ -29139,65 +29422,266 @@ msgstr "S�bh�il 'san _fillte�n"
 msgid "_Advanced..."
 msgstr "_Iat�n"
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "Eolas"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "Earraidh"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "Freagra"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "Sce�l"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr ""
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "C_uardaigh..."
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "Glan"
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:833
+msgid "Item ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:840
+msgid "Subitem ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:847
+#, fuzzy
+msgid "Text"
+msgstr "An Tib�id"
+
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Glan"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr ""
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+msgid "Evolution Addressbook local/LDAP backend"
 msgstr ""
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
+msgid "Evolution Calendar local file backend"
 msgstr ""
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+msgid "Evolution Addressbook local file backend"
 msgstr ""
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr ""
+#, fuzzy
+#~ msgid "1234"
+#~ msgstr "123"
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr ""
+#, fuzzy
+#~ msgid "380"
+#~ msgstr "389"
+
+#, fuzzy
+#~ msgid "<- _Remove"
+#~ msgstr "_Scr�os"
+
+#, fuzzy
+#~ msgid "<< Fewer Options"
+#~ msgstr "Roghanna"
+
+#, fuzzy
+#~ msgid "DN Customization"
+#~ msgstr "Gan Eolas"
+
+#, fuzzy
+#~ msgid "Evolution Attribute"
+#~ msgstr "Alairm Evolution"
+
+# CH
+#, fuzzy
+#~ msgid "Mappings"
+#~ msgstr "An tS�n"
+
+#, fuzzy
+#~ msgid "R_estore Defaults"
+#~ msgstr "Gn�th"
+
+#, fuzzy
+#~ msgid "Re_store Defaults"
+#~ msgstr "Gn�th"
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "T�g Gach Rud"
+
+#, fuzzy
+#~ msgid "_Add ->"
+#~ msgstr "_Suimigh"
+
+# ##
+# ## Languages (ISO 639 code in brackets)
+# ## 	The 'msgid' names and spellings for languages are those listed
+# ##     in iso-639.def from glibc
+# aa 
+#, fuzzy
+#~ msgid "_Always"
+#~ msgstr "Af�iris"
+
+#, fuzzy
+#~ msgid "_Delete Mapping"
+#~ msgstr "_Dealaigh gach rud"
+
+#, fuzzy
+#~ msgid "_Edit Mapping"
+#~ msgstr "Eagar coinne"
+
+#, fuzzy
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Alairm Evolution"
+
+#, fuzzy
+#~ msgid "_More Options >>"
+#~ msgstr "_Roghanna"
+
+#, fuzzy
+#~ msgid "_Restore Defaults"
+#~ msgstr "Gn�th"
+
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "Cuntas %d"
+
+#, fuzzy
+#~ msgid "C_ontacts..."
+#~ msgstr "_Tadhalla�..."
+
+#~ msgid "Phone Types"
+#~ msgstr "Cin�al  F�in"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "Dealaigh Tadhall?"
+
+#, fuzzy
+#~ msgid "Display Cards?"
+#~ msgstr "Taispea�n"
+
+#, fuzzy
+#~ msgid "Display Cards"
+#~ msgstr "Taispea�n"
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "T�ip ag tosnaithe GNOME"
+
+#, fuzzy
+#~ msgid "st"
+#~ msgstr "l�osta"
+
+#, fuzzy
+#~ msgid "nd"
+#~ msgstr "Post"
+
+#, fuzzy
+#~ msgid "rd"
+#~ msgstr "r"
+
+#, fuzzy
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "Te�p ag fork: %s"
+
+#~ msgid "Print Calendar"
+#~ msgstr "Priont�il Feilire"
+
+#~ msgid "Warning!"
+#~ msgstr "Rabhadh!"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr ""
+#~ "Go raibh maith agat\n"
+#~ "An Fhoireann Evolution\n"
+
+# ug
+#, fuzzy
+#~ msgid "hour"
+#~ msgstr "��ghur"
+
+#~ msgid "week"
+#~ msgstr "seachtain"
+
+#~ msgid "year"
+#~ msgstr "bliain"
+
+#, fuzzy
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "Ag S�bh�il scealta"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Alairm Evolution"
+
+#, fuzzy
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Scr�os an sceal seo"
+
+# SG
+#, fuzzy
+#~ msgid "Add Signature"
+#~ msgstr "Singeap�r"
+
+#, fuzzy
+#~ msgid "Account %d"
+#~ msgstr "Cuntas"
+
+#, fuzzy
+#~ msgid "_Variable-width:"
+#~ msgstr "Luaineach"
+
+#~ msgid "All folders"
+#~ msgstr "Gach Fillte�in"
+
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "Aibre�in"
+
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "T�g Comhad"
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr "Te�p ag fork: %s"
+
+#~ msgid "New..."
+#~ msgstr "Nua..."
+
+#~ msgid "Host"
+#~ msgstr "�st"
+
+#~ msgid "Output File"
+#~ msgstr "Comhad Aschur"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "Albachta� Phoist"
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Socr� Post"
 
 #, fuzzy
 #~ msgid "_Configure..."
@@ -29313,9 +29797,6 @@ msgstr ""
 #~ msgid "I/O Error: %s"
 #~ msgstr "Earraidh I/A"
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Eagarth�ir Nuachr�in Evolution"
-
 #~ msgid "NNTP Server:"
 #~ msgstr "Freatala� NNTP:"
 
@@ -29327,9 +29808,6 @@ msgstr ""
 #~ msgid "View messages..."
 #~ msgstr "Clodaigh teachtairecht..."
 
-#~ msgid "Evolution - Create new folder"
-#~ msgstr "Evolution - Cruthaigh fillte�n nua"
-
 #, fuzzy
 #~ msgid "Send the message later"
 #~ msgstr "Post an sce�l seo"
@@ -29370,10 +29848,6 @@ msgstr ""
 #~ msgstr "_Eagar"
 
 #, fuzzy
-#~ msgid " New "
-#~ msgstr "_Nua"
-
-#, fuzzy
 #~ msgid "Advanced Options"
 #~ msgstr "Roghanna"
 
@@ -29419,9 +29893,6 @@ msgstr ""
 #~ msgid "Riga"
 #~ msgstr "Deis:"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Eagar Leabhar Sheoladh"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Suim Leabhar Seoladh"
 
@@ -29510,9 +29981,6 @@ msgstr ""
 #~ msgid "(No name)"
 #~ msgstr "(gan ainm)"
 
-#~ msgid "New List"
-#~ msgstr "L�osta Nua"
-
 #, fuzzy
 #~ msgid "Create a New All Day _Event"
 #~ msgstr "Cruthaigh All Day Event nua"
@@ -29803,9 +30271,6 @@ msgstr ""
 #~ msgid "z"
 #~ msgstr "z"
 
-#~ msgid "Save calendar"
-#~ msgstr "S�bh�il Feilire"
-
 #~ msgid "%I:%M%p"
 #~ msgstr "%I:%M%p"
 
diff --git a/po/gl.po b/po/gl.po
index deba6e1c3c..a5cd3788ba 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-10-28 16:49-0500\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2001-09-17 15:10+0200\n"
 "Last-Translator: Manuel A. Fern�ndez Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -20,42 +20,52 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Factory to import LDIF files into Evolution."
-msgstr "F�brica para importar ficheiros VCard a Evolution."
+msgid "Evolution LDIF importer"
+msgstr "Asistente Importador de Evolution"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Imports LDIF files into Evolution."
-msgstr "Importa ficheiros VCard a Evolution."
+msgid "Evolution VCard Importer"
+msgstr "Compositor de correo de Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "F�brica para importar ficheiros VCard a Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Compositor de correo de Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importa ficheiros VCard a Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Arquivar coma"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nome:"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Correo Electr�nico"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Principal"
 
@@ -66,16 +76,17 @@ msgstr "Principal"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Asistente"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Traballo"
 
@@ -86,12 +97,12 @@ msgid "Bus"
 msgstr "Ocupado"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Resposta"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Compa��a"
 
@@ -103,12 +114,13 @@ msgstr "Copiar"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Particular"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organizaci�n"
@@ -122,18 +134,18 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "M�bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "Autom�bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax do Traballo"
@@ -144,13 +156,13 @@ msgid "Bus Fax"
 msgstr "Fax do Traballo"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax Particular"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Traballo 2"
 
@@ -160,43 +172,43 @@ msgid "Bus 2"
 msgstr "Ocupado"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Particular 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "RDSI"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Outro"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Outro Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Buscapersoas"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
@@ -207,15 +219,15 @@ msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Correo Electr�nico 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Correo Electr�nico 3"
@@ -239,6 +251,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Oficina"
@@ -249,6 +262,7 @@ msgid "Off"
 msgstr "Oficina"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "T�tulo"
@@ -263,6 +277,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Xestor"
@@ -277,6 +292,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Alcume"
@@ -287,16 +303,19 @@ msgid "Nick"
 msgstr "Alcume"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1418
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "C�nxuxe"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1459
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Nota"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Axenda"
@@ -316,254 +335,358 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:100
 #, fuzzy
+msgid "Default server calendar"
+msgstr "Gardar axenda"
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "Axenda"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
+#, fuzzy
 msgid "Anniversary"
 msgstr "Ani_versario:"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "Data de Nacemento: "
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Categor�as"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 #, fuzzy
 msgid "Family Name"
 msgstr "Nome Completo:"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "Autom�bil"
+
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-card-simple.c:893
 #: addressbook/backend/ebook/e-destination.c:706
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "Varias VCards"
+#: addressbook/backend/ebook/e-card.c:1308
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Nome Completo:"
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard de %s"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Enderezo:"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "Tarxetas de Enderezos"
+
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "Nada"
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr ""
+"\n"
+"Data de Nacemento: "
+
+#: addressbook/backend/ebook/e-card.c:1355
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL:"
+
+#: addressbook/backend/ebook/e-card.c:1369
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Organizaci�n"
+
+#: addressbook/backend/ebook/e-card.c:1390
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Papel"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-#: addressbook/backend/ebook/load-pine-addressbook.c:22
-#: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
-#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+#, fuzzy
+msgid "Mailer"
+msgstr ""
+"\n"
+"Cliente de Correo: "
+
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "URL libre-ocupado"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Axenda"
+
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "�Borrar Contacto?"
+
+#: addressbook/backend/ebook/e-card.c:1480
+#, fuzzy
+msgid "Category List"
+msgstr "A categor�a �"
+
+#: addressbook/backend/ebook/e-card.c:1487
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1494
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1501
+#, fuzzy
+msgid "List"
+msgstr "Br�tema"
+
+#: addressbook/backend/ebook/e-card.c:1508
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Outro Enderezo"
+
+#: addressbook/backend/ebook/e-card.c:1515
+#, fuzzy
+msgid "Arbitrary"
+msgstr "Principal"
+
+#: addressbook/backend/ebook/e-card.c:1522
+#, fuzzy
+msgid "ID"
+msgstr "I"
+
+#: addressbook/backend/ebook/e-card.c:1529
+#, fuzzy
+msgid "Last Use"
+msgstr "Pegar"
+
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "Puntuaci�n"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:2978
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 #, fuzzy
 msgid "Searching..."
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 #, fuzzy
 msgid "Loading..."
 msgstr "Agardando..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "_Nome da lista:"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "_Este � o enderezo de correo"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Conectando ao servidor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Conectando ao servidor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Eliminando as tarxetas..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1572
-#: addressbook/backend/pas/pas-backend-ldap.c:1575
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 #, fuzzy
 msgid "Error performing search"
 msgstr "Erro ao elimina-la tarxeta"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 #, fuzzy
 msgid "Default Sync Address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Non foi posible cargar o cursor\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicaci�n Enderezo do pilot"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Un control de Bonobo para un men� emerxente de enderezo."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Un control de Bonobo para amosar un enderezo."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Un control Bonobo de exemplo que amosa un libro de enderezos."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "F�brica para o compo�ente Libro de Enderezos de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Configure access to LDAP directory servers here"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control que amosa unha minitarxeta de libro de enderezos de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Editar o Libro de Enderezos"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Compo�ente de Evolution para manexar contactos."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Interface de selecci�n de nome do Libro de Enderezos de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "F�brica para o control de Minitarxetas do Libro de Enderezos"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "F�brica para o men� emerxente de enderezos do Libro de Enderezos"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr "F�brica para o visor de enderezos do Libro de Enderezos"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
-msgstr "F�brica para o men� emerxente de enderezos do Libro de Enderezos"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 #, fuzzy
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr "F�brica para o compo�ente Libro de Enderezos de Evolution."
+msgid "Evolution Addressbook component"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr "F�brica para o control de exemplo do Libro de Enderezos"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
 
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:611
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1067
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
 msgstr "Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "Cartafol que cont�n informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor NNTP:"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "Cartafol que cont�n informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public Contacts"
 msgstr "Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public folder containing contact information"
 msgstr "Cartafol que cont�n informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Novo Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Crear un novo contacto"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "Lista de _Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Crear unha nova lista de contactos"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr ""
@@ -571,7 +694,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -579,58 +702,49 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:648
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1193
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "A resposta do servidor IMAP non conti�a informaci�n sobre %s"
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Erro ao cargar a informaci�n do filtro:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "A resposta do servidor IMAP non conti�a informaci�n sobre %s"
 
-#: addressbook/gui/component/addressbook-config.c:1630
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL non est� soportado nesta versi�n de evolution)"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Nome da Conta"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Nome do Servidor"
 
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
-msgid "Could not initialize gnome-vfs"
-msgstr "Non foi posible inicializar gnome-vfs"
+#: addressbook/gui/component/addressbook-config.c:1676
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL non est� soportado nesta versi�n de evolution)"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Outros Contactos"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "Non se pode abrir o libro de enderezos"
-
-#: addressbook/gui/component/addressbook.c:480
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -638,7 +752,7 @@ msgstr ""
 "Non foi posible abrir este libro de enderezos. Por favor, comprobe\n"
 "que a ruta existe e que ten permisos para acceder a ela."
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:522
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -649,7 +763,7 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP est�\n"
 "f�ra de servicio"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -661,7 +775,7 @@ msgstr ""
 "debe compilar o programa desde as fontes do CVS\n"
 "logo de obter OpenLDAP desde o enlace de abaixo.\n"
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:537
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -672,12 +786,15 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP est�\n"
 "f�ra de servicio"
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:582
+#: addressbook/gui/component/addressbook.c:557
+msgid "Unable to open addressbook"
+msgstr "Non se pode abrir o libro de enderezos"
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -685,38 +802,38 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:633
-#: addressbook/gui/component/addressbook.c:636
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 #, fuzzy
 msgid "Name begins with"
 msgstr "remata en"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 #, fuzzy
 msgid "Email begins with"
 msgstr "remata en"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "A categor�a �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Calquera campo cont�n"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/component/addressbook.c:956
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -724,7 +841,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:962
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -732,25 +849,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:968
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:975
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1050
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr "Calquera Categor�a"
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que ha amosar o Navegador de Cartafoles"
 
@@ -759,140 +876,126 @@ msgstr "O URI que ha amosar o Navegador de Cartafoles"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
 msgid "(none)"
 msgstr "(ning�n)"
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/component/e-address-popup.c:478
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "Correo Electr�nico Principal"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Escolla unha Acci�n"
 
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:622
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Crear un novo contacto \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:638
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Engadir un enderezo a un contacto existente \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Buscando no Libro de Enderezos..."
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Editar Informaci�n de Contacto"
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Engadir a Contactos"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Mestura-lo Enderezo de Correo"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Desactivar Petici�ns"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Activar Petici�ns (�Perigoso!)"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "Dete_ctar tipos soportados "
 
-#: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "1234"
-msgstr "123"
+#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
+msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:5
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-#, fuzzy
-msgid "380"
-msgstr "389"
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "636"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "666"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "<- _Remove"
-msgstr "_Eliminar"
+msgid "Add LDAP Server"
+msgstr "Servidor NNTP:"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Opci�ns"
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "Fontes do Libro de Enderezos"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always"
 msgstr "Alarmas"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Anonymously"
 msgstr "An�nimo"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -901,79 +1004,60 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Connecting"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
-msgid "DN Customization"
-msgstr "Personalizar"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "E_liminar"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Nome da lista:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "Servidor NNTP:"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
-msgid "Evolution Attribute"
-msgstr "Evolution"
-
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Finished"
 msgstr "B_uscar"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-#, fuzzy
-msgid "LDAP Attribute"
-msgstr "Autenticaci�n LDAP"
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "LDAP Configuration Assistant"
 msgstr "Configuraci�n do Correo"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Mappings"
-msgstr "Marxes"
-
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -983,75 +1067,36 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:42
-msgid "Objectclasses Used in Evolution:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses Used on Server:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "�nico"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-#, fuzzy
-msgid "R_estore Defaults"
-msgstr "Opci�ns por defecto"
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-#, fuzzy
-msgid "Re_store Defaults"
-msgstr "Opci�ns por defecto"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "�mbito da busca:"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
-#: calendar/gui/e-week-view.c:1240
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
 #, fuzzy
 msgid "Searching"
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
-msgid "Select"
-msgstr "Seleccionar Todo"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Eliminada"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -1062,7 +1107,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1071,54 +1116,47 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Informaci�n da Fonte"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Conectando ao servidor..."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Armacenar busca como CartafolV"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1126,7 +1164,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1135,7 +1173,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1143,17 +1181,17 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
 "directory tree. A search scope of \"sub\" will include all entries below "
 "your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1163,27 +1201,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1193,7 +1231,7 @@ msgstr ""
 "Este nome hase empregar para identifica-la conta. S� se empregar� para "
 "amosar."
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1201,88 +1239,46 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "Using email address"
 msgstr "_Este � o enderezo de correo"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:108
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Engadir"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-#, fuzzy
-msgid "_Add ->"
-msgstr "_Engadir"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-#, fuzzy
-msgid "_Add Mapping"
-msgstr "Engadir acci�n"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-#, fuzzy
-msgid "_Add to DN"
-msgstr "Engadir acci�n"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-#, fuzzy
-msgid "_Always"
-msgstr "Alarmas"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "_Borrar todo"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Amosar"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Distinguished Name (DN):"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_Don't use SSL/TLS"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1292,215 +1288,153 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "_Editar cita"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-#, fuzzy
-msgid "_Evolution attribute:"
-msgstr "Evolution"
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_If necessary "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "_LDAP attributes:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-#, fuzzy
-msgid "_More Options >>"
-msgstr "_Opci�ns"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Porto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
-#, fuzzy
-msgid "_Restore Defaults"
-msgstr "Opci�ns por defecto"
-
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Tempo de adiamento (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
-#, fuzzy
-msgid "account-druid"
-msgstr "Conta"
-
-#: addressbook/gui/component/ldap-config.glade.h:132
-#, fuzzy
-msgid "account-editor"
-msgstr "editor-de-contactos"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:136
-msgid "edit_server_window_simple"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:97
 #, fuzzy
 msgid "general-tab"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:139
-msgid "objectclasses-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "searching-tab"
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
 msgstr "Interface de selecci�n de nome do Libro de Enderezos de Evolution"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
-"F�brica para a interface de selecci�n de nome do Libro de Enderezos de "
-"Evolution"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Eliminar Todos"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:699
-#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
-#: shell/e-shortcuts-view.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Eliminar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr "Eliminar Todos"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
-msgid "Send HTML Mail?"
-msgstr "�Enviar Correo HTML?"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
-msgid "Edit Contact List"
-msgstr "Lista de _Contactos"
+msgid "View Contact List"
+msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
-msgid "Unnamed Contact List"
-msgstr "Contacto Sen Nome"
+msgid "View Contact Info"
+msgstr "Editar Informaci�n de Contacto"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
-msgstr ""
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
+msgid "Send HTML Mail?"
+msgstr "�Enviar Correo HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+msgid "Source"
+msgstr "Fonte"
+
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionar Contactos do Libro de Enderezos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:564
+#: addressbook/gui/component/select-names/e-select-names.c:648
 #, fuzzy
 msgid "Find contact in"
 msgstr "Buscar un contacto"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Find"
+msgstr "Buscar:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Seleccionar Nomes"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 #, fuzzy
 msgid "Selected Contacts:"
 msgstr "�Borrar Contacto?"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 #, fuzzy
 msgid "Show Contacts"
 msgstr "Contactos"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid ""
 "Type a name into the entry, or\n"
 "select one from the list below:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
 msgstr "_Categor�a:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "Carta_fol:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "A_ssistant's name:"
 msgstr "Nome do _asistente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 #, fuzzy
 msgid "Add_ress..."
 msgstr "_Enderezo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "Ani_versario:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
 msgid "Birthda_y:"
 msgstr "_Aniversario:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "C_ontactos..."
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegor�as..."
@@ -1511,7 +1445,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
@@ -1521,7 +1455,7 @@ msgid "D_epartment:"
 msgstr "_Departamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "Detalles"
 
@@ -1563,1150 +1497,1199 @@ msgstr "Organi_zaci�n:"
 msgid "P_rofession:"
 msgstr "_Profesi�n:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Tipos de Tel�fono"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "S_pouse:"
 msgstr "_C�nxuxe:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "This is the _mailing address"
 msgstr "_Este � o enderezo de correo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Wants to receive _HTML mail"
 msgstr "Quere recibir correo en _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
-#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
-#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "_Posto de traballo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "Nome do _Administrador:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "_Alcume:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "_Public Calendar URL:"
 msgstr "Imprimir Axenda"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "Enderezo da p�xina _Web:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:183
+#, fuzzy
+msgid "Editable"
+msgstr "Activado"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr "Afganist�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Alxeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr "Anguila"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Antarctica"
 msgstr "Ant�rtida"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr "Antiga e Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Arxentina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Australia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Austria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "Acerbaix�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr "Bielorrusia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "B�lxica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "Belice"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr "Bermudas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr "But�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia e Hercegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr "Botsuana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr "Illa Bouvet"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brasil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
 msgstr "Territorios Brit�nicos do Oc�ano �ndico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr "Camboia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr "Camer�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Canad�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Illas Caym�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
 msgstr "Rep�blica Centroafricana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "Chad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "China"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Illa Christmas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr "Illas Cocos (Keeling)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Colombia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr "Comores"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Congo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr "Illas Cook"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr "Costa de Marf�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Croacia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Cuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Chipre"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Rep�blica Checa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr "Xibut�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Rep�blica Dominicana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "Timor Oriental"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Exipto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "O Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Guinea Ecuatorial"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiop�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Illas Falkland (Malvinas)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Illas Feroe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fiji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Francia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "G�iana Francesa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Polinesia Francesa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Territorios Franceses do Sul"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gab�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Xeorxia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Alema�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Gana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Xibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Grecia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Grenlandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Granada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr "Guinea-Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "G�iana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "Hait�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr "Illas Heard e McDonald"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "Santa S�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Hungr�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Islandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Italia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Xamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Xap�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Xordania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazakhst�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Quenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Quiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #, fuzzy
 msgid "Korea, Republic Of"
 msgstr "Rep�blica de Corea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuvait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr "Kirgizst�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr "Letonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "L�bano"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Macau"
 msgstr "Macau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr "Malaui"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr "Malaisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr "Illas Marshall"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr "Martinica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr "Mauricio"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr "Maiote"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr "M�xico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Moldova, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
 msgstr "M�naco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr "Marrocos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr "Naur�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr "Pa�ses Baixos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "Antillas Holandesas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "Nova Caledonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr "Nova Celandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr "N�xer"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr "Nixeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr "Illa Norfolk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr "Illas Marianas do Norte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr "Noruega"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr "Om�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
 msgid "Pakistan"
 msgstr "Paquist�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 #, fuzzy
 msgid "Palestinian Territory"
 msgstr "Territorios Brit�nicos do Oc�ano �ndico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
 msgid "Panama"
 msgstr "Panam�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr "Pap�a Nova Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
 msgid "Peru"
 msgstr "Per�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr "Polonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr "Xuntanza"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr "Roman�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr "Federaci�n Rusa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr "Santo Cristobo e Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr "Santa Luc�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Vincent And The Grena-dines"
 msgstr "San Vicente e Granadinas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
 msgstr "San Tom� e Pr�ncipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr "Arabia Saud�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr "Seichelles"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr "Serra Leoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr "Singapur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr "Illas Salom�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr "Sud�frica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Xeorxia do Sul e Illas Sandwich do Sul"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr "Espa�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr "Santa Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre e Miquel�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr "Sud�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Illas Svalbard e Jan Mayen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr "Suazilandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr "Suecia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr "Su�za"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr "Taiw�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr "Tajikist�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 #, fuzzy
 msgid "Tanzania, United Republic Of"
 msgstr "Rep�blica Unida de Tanzania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr "Toquelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr "Trinidad e Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "Tunicia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr "Turqu�a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr "Turkmenist�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr "Illas Turk e Caicos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr "Ucra�na"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
 msgstr "Emiratos �rabes Unidos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr "Illas Exteriores Menores dos EEUU"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr "Uzbekist�n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr "Viet Nam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #, fuzzy
 msgid "Virgin Islands, British"
 msgstr "Illas Virxes"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 #, fuzzy
 msgid "Virgin Islands, U.S."
 msgstr "Illas Virxes"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr "Illas Wallis e Futuna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr "Sahara Occidental"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr "Iemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr "Iugoslavia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: